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  
				
					
						
							
							
								 
						
							
							
								27fe3e2d4f 
								
							
								 
							
						 
						
							
							
								
								Bump changelog and version  
							
							
							
						 
						
							2016-08-08 11:31:12 +01:00  
				
					
						
							
							
								 
						
							
							
								3410142741 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0  
							
							
							
						 
						
							2016-08-08 11:24:53 +01:00  
				
					
						
							
							
								 
						
							
							
								7c1a92274c 
								
							
								 
							
						 
						
							
							
								
								Make psutil optional  
							
							
							
						 
						
							2016-08-08 11:12:21 +01:00  
				
					
						
							
							
								 
						
							
							
								f5deaff424 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #991  from matrix-org/erikj/retry_make  
							
							... 
							
							
							
							Retry joining via other servers if first one failed. Fix some other bugs. 
							
						 
						
							2016-08-05 18:21:27 +01:00  
				
					
						
							
							
								 
						
							
							
								5f360182c6 
								
							
								 
							
						 
						
							
							
								
								Fix a couple of python bugs  
							
							
							
						 
						
							2016-08-05 18:08:32 +01:00  
				
					
						
							
							
								 
						
							
							
								46453bfc2f 
								
							
								 
							
						 
						
							
							
								
								Retry joining via other servers if first one failed  
							
							
							
						 
						
							2016-08-05 18:02:03 +01:00  
				
					
						
							
							
								 
						
							
							
								6bf6bc1d1d 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #990  from matrix-org/erikj/fed_vers  
							
							... 
							
							
							
							Add federation /version API 
							
						 
						
							2016-08-05 16:59:16 +01:00  
				
					
						
							
							
								 
						
							
							
								24f36469bc 
								
							
								 
							
						 
						
							
							
								
								Add federation /version API  
							
							
							
						 
						
							2016-08-05 16:36:07 +01:00  
				
					
						
							
							
								 
						
							
							
								597c79be10 
								
							
								 
							
						 
						
							
							
								
								Change the way we specify if we require auth or not  
							
							
							
						 
						
							2016-08-05 16:17:04 +01:00  
				
					
						
							
							
								 
						
							
							
								e6021c370e 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #989  from matrix-org/erikj/raise_404  
							
							... 
							
							
							
							Raise 404 when couldn't find event 
							
						 
						
							2016-08-05 15:54:16 +01:00  
				
					
						
							
							
								 
						
							
							
								a8b946decb 
								
							
								 
							
						 
						
							
							
								
								Raise 404 when couldn't find event  
							
							
							
						 
						
							2016-08-05 15:31:02 +01:00  
				
					
						
							
							
								 
						
							
							
								5bcccfde6c 
								
							
								 
							
						 
						
							
							
								
								Don't include html comments in description  
							
							
							
						 
						
							2016-08-05 14:45:11 +01:00  
				
					
						
							
							
								 
						
							
							
								4d87d3659a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0  
							
							
							
						 
						
							2016-08-05 13:19:22 +01:00  
				
					
						
							
							
								 
						
							
							
								93acf49e9b 
								
							
								 
							
						 
						
							
							
								
								Fix backfill auth events  
							
							
							
						 
						
							2016-08-05 12:59:04 +01:00  
				
					
						
							
							
								 
						
							
							
								b2c290a6e5 
								
							
								 
							
						 
						
							
							
								
								Bump version and changelog  
							
							
							
						 
						
							2016-08-05 11:16:54 +01:00  
				
					
						
							
							
								 
						
							
							
								499dc1b349 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0  
							
							
							
						 
						
							2016-08-05 11:15:48 +01:00  
				
					
						
							
							
								 
						
							
							
								2d4de61fb7 
								
							
								 
							
						 
						
							
							
								
								Fix typo  
							
							
							
						 
						
							2016-08-05 10:48:56 +01:00  
				
					
						
							
							
								 
						
							
							
								fccadb7719 
								
							
								 
							
						 
						
							
							
								
								Check if we already have the events returned by /state/  
							
							
							
						 
						
							2016-08-05 10:43:47 +01:00  
				
					
						
							
							
								 
						
							
							
								f0fa66f495 
								
							
								 
							
						 
						
							
							
								
								Delete more tables  
							
							
							
						 
						
							2016-08-05 10:40:08 +01:00  
				
					
						
							
							
								 
						
							
							
								1515d1b581 
								
							
								 
							
						 
						
							
							
								
								Fallback to /state/ on both 400 and 404  
							
							
							
						 
						
							2016-08-05 10:24:23 +01:00  
				
					
						
							
							
								 
						
							
							
								a2b7102eea 
								
							
								 
							
						 
						
							
							
								
								Tweak integrity error recovery to work as intended  
							
							
							
						 
						
							2016-08-04 20:38:08 -07:00  
				
					
						
							
							
								 
						
							
							
								a5d7968b3e 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #973  from matrix-org/erikj/xpath_fix  
							
							... 
							
							
							
							Change the way we summarize URLs 
							
						 
						
							2016-08-04 16:37:25 +01:00  
				
					
						
							
							
								 
						
							
							
								b5525c76d1 
								
							
								 
							
						 
						
							
							
								
								Typo  
							
							
							
						 
						
							2016-08-04 16:10:08 +01:00  
				
					
						
							
							
								 
						
							
							
								e97648c4e2 
								
							
								 
							
						 
						
							
							
								
								Test summarization  
							
							
							
						 
						
							2016-08-04 16:09:09 +01:00  
				
					
						
							
							
								 
						
							
							
								835ceeee76 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #983  from matrix-org/erikj/retry_on_integrity_error  
							
							... 
							
							
							
							Retry event persistence on IntegrityError 
							
						 
						
							2016-08-04 15:40:03 +01:00  
				
					
						
							
							
								 
						
							
							
								b3682df2ca 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/xpath_fix  
							
							
							
						 
						
							2016-08-04 15:29:45 +01:00  
				
					
						
							
							
								 
						
							
							
								8ad8490cff 
								
							
								 
							
						 
						
							
							
								
								Fix typo  
							
							
							
						 
						
							2016-08-04 15:21:29 +01:00  
				
					
						
							
							
								 
						
							
							
								59fa91fe88 
								
							
								 
							
						 
						
							
							
								
								Retry event persistence on IntegrityError  
							
							... 
							
							
							
							Due to a bug in the porting script some backfilled events were not
correctly persisted, causing irrecoverable IntegrityErrors on future
attempts to persist those events.
This commit adds a retry mechanism invoked upon IntegrityError,
where when retried the tables are purged for all references to the
events being persisted. 
							
						 
						
							2016-08-04 15:02:15 +01:00  
				
					
						
							
							
								 
						
							
							
								257c41cc2e 
								
							
								 
							
						 
						
							
							
								
								Fix typos.  
							
							
							
						 
						
							2016-08-04 14:05:45 +01:00  
				
					
						
							
							
								 
						
							
							
								b4e2290d89 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_ids_api  
							
							
							
						 
						
							2016-08-04 14:04:35 +01:00  
				
					
						
							
							
								 
						
							
							
								e3ee63578f 
								
							
								 
							
						 
						
							
							
								
								Tidy up get_events  
							
							
							
						 
						
							2016-08-04 14:01:18 +01:00  
				
					
						
							
							
								 
						
							
							
								f131cd9e53 
								
							
								 
							
						 
						
							
							
								
								keys/query: Omit device displayname if null  
							
							... 
							
							
							
							... which makes it more consistent with user displaynames. 
							
						 
						
							2016-08-04 10:59:51 +01:00  
				
					
						
							
							
								 
						
							
							
								edb33eb163 
								
							
								 
							
						 
						
							
							
								
								Rename fields to _ids  
							
							
							
						 
						
							2016-08-03 17:19:15 +01:00  
				
					
						
							
							
								 
						
							
							
								bcc9cda8ca 
								
							
								 
							
						 
						
							
							
								
								Fix copy + paste fails  
							
							
							
						 
						
							2016-08-03 17:17:26 +01:00  
				
					
						
							
							
								 
						
							
							
								98385888b8 
								
							
								 
							
						 
						
							
							
								
								PEP8  
							
							
							
						 
						
							2016-08-03 15:42:08 +01:00  
				
					
						
							
							
								 
						
							
							
								68264d7404 
								
							
								 
							
						 
						
							
							
								
								Include device name in /keys/query response  
							
							... 
							
							
							
							Add an 'unsigned' section which includes the device display name. 
							
						 
						
							2016-08-03 15:42:08 +01:00  
				
					
						
							
							
								 
						
							
							
								91fa69e029 
								
							
								 
							
						 
						
							
							
								
								keys/query: return all users which were asked for  
							
							... 
							
							
							
							In the situation where all of a user's devices get deleted, we want to
indicate this to a client, so we want to return an empty dictionary, rather
than nothing at all. 
							
						 
						
							2016-08-03 15:41:44 +01:00  
				
					
						
							
							
								 
						
							
							
								4c56bedee3 
								
							
								 
							
						 
						
							
							
								
								Actually call get_room_state  
							
							
							
						 
						
							2016-08-03 15:04:29 +01:00  
				
					
						
							
							
								 
						
							
							
								520ee9bd2c 
								
							
								 
							
						 
						
							
							
								
								Fix syntax error  
							
							
							
						 
						
							2016-08-03 15:03:15 +01:00  
				
					
						
							
							
								 
						
							
							
								a60a2eaa02 
								
							
								 
							
						 
						
							
							
								
								Comment  
							
							
							
						 
						
							2016-08-03 14:52:43 +01:00  
				
					
						
							
							
								 
						
							
							
								e3a720217a 
								
							
								 
							
						 
						
							
							
								
								Add /state_ids federation API  
							
							... 
							
							
							
							The new API only returns the event_ids for the state, as most
requesters will already have the vast majority of the events already. 
							
						 
						
							2016-08-03 14:47:37 +01:00  
				
					
						
							
							
								 
						
							
							
								530bc862dc 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'rav/null_default_device_displayname' into develop  
							
							
							
						 
						
							2016-08-03 14:30:32 +01:00  
				
					
						
							
							
								 
						
							
							
								a6f5cc65d9 
								
							
								 
							
						 
						
							
							
								
								PEP8  
							
							
							
						 
						
							2016-08-03 14:30:06 +01:00  
				
					
						
							
							
								 
						
							
							
								e555bc6551 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'rav/refactor_device_query' into develop  
							
							
							
						 
						
							2016-08-03 14:26:01 +01:00  
				
					
						
							
							
								 
						
							
							
								a843868fe9 
								
							
								 
							
						 
						
							
							
								
								E2eKeysHandler: minor tweaks  
							
							... 
							
							
							
							PR feedback 
							
						 
						
							2016-08-03 14:24:33 +01:00  
				
					
						
							
							
								 
						
							
							
								80ad710217 
								
							
								 
							
						 
						
							
							
								
								Remove other bit of deduplication  
							
							
							
						 
						
							2016-08-03 13:25:59 +01:00  
				
					
						
							
							
								 
						
							
							
								4fec5e57be 
								
							
								 
							
						 
						
							
							
								
								Default device_display_name to null  
							
							... 
							
							
							
							It turns out that it's more useful to return a null device display name (and
let clients decide how to handle it: eg, falling back to device_id) than using
a constant string like "unknown device". 
							
						 
						
							2016-08-03 11:53:00 +01:00  
				
					
						
							
							
								 
						
							
							
								a8a32d2714 
								
							
								 
							
						 
						
							
							
								
								Ensure we only persist an event once at a time  
							
							
							
						 
						
							2016-08-03 11:23:39 +01:00  
				
					
						
							
							
								 
						
							
							
								921f17f938 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into rav/refactor_device_query  
							
							
							
						 
						
							2016-08-03 11:12:47 +01:00