Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								6fba9fd20c 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/release-v0.99.0' into develop  
							
							 
							
							
							
						 
						
							2019-01-30 17:02:32 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								ad7ac8853c 
								
							
								 
							
						 
						
							
							
								
								by default include m.room.encryption on invites ( #3902 )  
							
							 
							
							... 
							
							
							
							* by default include m.room.encryption on invites
* fix constant
* changelog 
							
						 
						
							2019-01-30 16:26:13 +00:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
								
								
							
							
								
							
								81b7e7eed3 
								
									
								
							
								 
							
						 
						
							
							
								
								Update constants.py  
							
							 
							
							... 
							
							
							
							remove trailing , 
							
						 
						
							2019-01-30 16:11:36 +00:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
								
								
							
							
								
							
								ee4df7fd7a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into neilj/room_capabilities  
							
							 
							
							
							
						 
						
							2019-01-30 10:28:08 +00:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								c5a0f82cca 
								
							
								 
							
						 
						
							
							
								
								define room dispositions for use in exposing room capabilities  
							
							 
							
							
							
						 
						
							2019-01-30 10:24:24 +00:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								c7837dce24 
								
							
								 
							
						 
						
							
							
								
								reflect that rooms v3 is a stable room version  
							
							 
							
							
							
						 
						
							2019-01-30 09:33:30 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a1b0e1879b 
								
							
								 
							
						 
						
							
							
								
								Enable room version v3  
							
							 
							
							
							
						 
						
							2019-01-29 23:09:10 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a696c48133 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/redactions_eiah  
							
							 
							
							
							
						 
						
							2019-01-29 22:00:33 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								47e2dd1994 
								
							
								 
							
						 
						
							
							
								
								Drop vdh support  
							
							 
							
							
							
						 
						
							2019-01-29 21:24:34 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								84af577356 
								
							
								 
							
						 
						
							
							
								
								Implement event format v2  
							
							 
							
							
							
						 
						
							2019-01-29 18:06:11 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b82a76c384 
								
							
								 
							
						 
						
							
							
								
								Finish comment...  
							
							 
							
							
							
						 
						
							2019-01-29 13:50:59 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								64c1bd1d21 
								
							
								 
							
						 
						
							
							
								
								Remove dead function  
							
							 
							
							
							
						 
						
							2019-01-29 12:06:28 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								7709d2bd16 
								
							
								 
							
						 
						
							
							
								
								Implement rechecking of redactions  
							
							 
							
							
							
						 
						
							2019-01-29 11:56:20 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								7a3ec5b022 
								
							
								 
							
						 
						
							
							
								
								Add RoomVersions.V3 constant, without enabling it  
							
							 
							
							... 
							
							
							
							We add the constant, but don't add it to the known room versions. This
lets us start adding V3 logic, but the servers will never join or create
V3 rooms 
							
						 
						
							2019-01-29 11:55:33 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5180f12bae 
								
							
								 
							
						 
						
							
							
								
								Replace usage of builder.user_id with builder.sender  
							
							 
							
							... 
							
							
							
							`.user_id` is proxed to `.sender` in FrozenEvent, so this has no
functional change 
							
						 
						
							2019-01-29 11:18:38 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ae2a957dba 
								
							
								 
							
						 
						
							
							
								
								Pass through room version to event auth  
							
							 
							
							
							
						 
						
							2019-01-25 18:31:41 +00:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								893107be78 
								
							
								 
							
						 
						
							
							
								
								backout v3  
							
							 
							
							
							
						 
						
							2019-01-25 17:27:36 +00:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								53ef4da8c2 
								
							
								 
							
						 
						
							
							
								
								track unstable room v3  
							
							 
							
							
							
						 
						
							2019-01-25 11:04:11 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
								
								
							
							
								
							
								b1b6dba2d2 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4415  from matrix-org/anoa/full_search_upgraded_rooms  
							
							 
							
							... 
							
							
							
							Ability to search entire room history after upgrading room 
							
						 
						
							2019-01-25 10:49:58 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								664b7a2920 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4437  from matrix-org/erikj/event_format_version_v2  
							
							 
							
							... 
							
							
							
							Add support for persisting event format versions 
							
						 
						
							2019-01-24 18:32:30 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								8ea509a935 
								
									
								
							
								 
							
						 
						
							
							
								
								Update synapse/api/filtering.py  
							
							 
							
							... 
							
							
							
							Co-Authored-By: anoadragon453 <1342360+anoadragon453@users.noreply.github.com> 
							
						 
						
							2019-01-24 17:21:35 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c5a296b10c 
								
							
								 
							
						 
						
							
							
								
								Add support for persisting event format versions  
							
							 
							
							... 
							
							
							
							Currently we only have the one event format version defined, but this
adds the necessary infrastructure to persist and fetch the format
versions alongside the events.
We specify the format version rather than the room version as:
1. We don't necessarily know the room version, existing events may be
   either v1 or v2.
2. We'd need to be careful to prevent/handle correctly if different
   events in the same room reported to be of different versions, which
   sounds annoying. 
							
						 
						
							2019-01-23 11:30:01 +00:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								d619b113ed 
								
							
								 
							
						 
						
							
							
								
								Fix None guard in config.server.is_threepid_reserved  
							
							 
							
							
							
						 
						
							2019-01-22 16:52:29 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								c433f61091 
								
							
								 
							
						 
						
							
							
								
								Ensure new filter is actually created  
							
							 
							
							
							
						 
						
							2019-01-22 12:06:36 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								c9bfb058d8 
								
							
								 
							
						 
						
							
							
								
								Fix a bug with single-room search searching all rooms  
							
							 
							
							... 
							
							
							
							* Create a new method for getting predecessor rooms
* Remove formatting change 
							
						 
						
							2019-01-22 12:00:41 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								35e1d67b4e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_v2_invite_server  
							
							 
							
							
							
						 
						
							2019-01-21 14:04:19 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								5f54765587 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4390  from matrix-org/erikj/versioned_fed_apis  
							
							 
							
							... 
							
							
							
							Add groundwork for new versions of federation APIs 
							
						 
						
							2019-01-21 11:44:05 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								702c4b750c 
								
							
								 
							
						 
						
							
							
								
								Migrate encryption state on room upgrade ( #4411 )  
							
							 
							
							... 
							
							
							
							* Migrate encryption state on room upgrade
Signed-off-by: Andrew Morgan <andrew@amorgan.xyz>
* Add changelog file 
							
						 
						
							2019-01-21 20:42:58 +11:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								df3a661e4a 
								
							
								 
							
						 
						
							
							
								
								Search for messages across predecessor rooms  
							
							 
							
							... 
							
							
							
							Signed-off-by: Andrew Morgan <andrew@amorgan.xyz> 
							
						 
						
							2019-01-18 11:19:20 +00:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								9ec56d6935 
								
							
								 
							
						 
						
							
							
								
								ALL_USER_TYPES should be a tuple  
							
							 
							
							
							
						 
						
							2019-01-15 14:38:15 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4a4d2e17bc 
								
							
								 
							
						 
						
							
							
								
								Add /v2/invite federation API  
							
							 
							
							
							
						 
						
							2019-01-15 13:22:44 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								bb63e7ca4f 
								
							
								 
							
						 
						
							
							
								
								Add groundwork for new versions of federation APIs  
							
							 
							
							
							
						 
						
							2019-01-15 11:14:34 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								e0910d0145 
								
							
								 
							
						 
						
							
							
								
								Merge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1  
							
							 
							
							... 
							
							
							
							Fixes  #4371  
							
						 
						
							2019-01-10 14:12:50 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								aa70d24125 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34  
							
							 
							
							
							
						 
						
							2019-01-10 12:58:33 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								566947ff34 
								
							
								 
							
						 
						
							
							
								
								Skip macaroon check for access tokens in the db  
							
							 
							
							
							
						 
						
							2019-01-10 12:57:21 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b970cb0e96 
								
							
								 
							
						 
						
							
							
								
								Refactor request sending to have better excpetions ( #4358 )  
							
							 
							
							... 
							
							
							
							* Correctly retry and back off if we get a HTTPerror response
* Refactor request sending to have better excpetions
MatrixFederationHttpClient blindly reraised exceptions to the caller
without differentiating "expected" failures (e.g. connection timeouts
etc) versus more severe problems (e.g. programming errors).
This commit adds a RequestSendFailed exception that is raised when
"expected" failures happen, allowing the TransactionQueue to log them as
warnings while allowing us to log other exceptions as actual exceptions. 
							
						 
						
							2019-01-08 11:04:28 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								a27e501b09 
								
							
								 
							
						 
						
							
							
								
								fix the check for whether `is_url` to match all the other ones in codebase ( #3405 )  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-01-06 21:43:25 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								cd018e3543 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4307  from matrix-org/erikj/v2_rooms  
							
							 
							
							... 
							
							
							
							Add v2 room version 
							
						 
						
							2018-12-24 10:48:59 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								df89f8afb8 
								
							
								 
							
						 
						
							
							
								
								Add v2 room version  
							
							 
							
							
							
						 
						
							2018-12-18 18:10:37 +00:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
								
								
							
							
								
							
								d2f7c4e6b1 
								
									
								
							
								 
							
						 
						
							
							
								
								create support user ( #4141 )  
							
							 
							
							... 
							
							
							
							Allow for the creation of a support user.
A support user can access the server, join rooms, interact with other users, but does not appear in the user directory nor does it contribute to monthly active user limits. 
							
						 
						
							2018-12-14 18:20:59 +00:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								1737753a62 
								
							
								 
							
						 
						
							
							
								
								Add an option to enable recording IPs for appservice users ( #3831 )  
							
							 
							
							
							
						 
						
							2018-12-04 12:44:41 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								c68aab1536 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4004  from matrix-org/travis/login-terms  
							
							 
							
							... 
							
							
							
							Add m.login.terms to the registration flow 
							
						 
						
							2018-11-01 11:03:38 -06:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b3dd6fa981 
								
							
								 
							
						 
						
							
							
								
								Add STATE_V2_TEST room version  
							
							 
							
							
							
						 
						
							2018-11-01 11:43:46 +00:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								d1e7b9c44c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/login-terms  
							
							 
							
							
							
						 
						
							2018-10-31 13:15:14 -06:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								f79f454485 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove deprecated v1 key exchange endpoint ( #4119 )  
							
							 
							
							
							
						 
						
							2018-10-31 22:29:02 +11:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								0f7d1c9906 
								
							
								 
							
						 
						
							
							
								
								Basic initial support for room upgrades  
							
							 
							
							... 
							
							
							
							Currently just creates a new, empty, room, and sends a tombstone in the old
room. 
							
						 
						
							2018-10-25 19:10:24 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								54def42c19 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/login-terms  
							
							 
							
							
							
						 
						
							2018-10-24 13:22:59 -06:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								7e07d25ed6 
								
							
								 
							
						 
						
							
							
								
								Allow backslashes in event field filters  
							
							 
							
							... 
							
							
							
							Fixes a bug introduced in https://github.com/matrix-org/synapse/pull/1783  which
meant that single backslashes were not allowed in event field filters.
The intention here is to allow single-backslashes, but disallow
double-backslashes. 
							
						 
						
							2018-10-24 11:11:24 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								f293d124b6 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/login-terms  
							
							 
							
							
							
						 
						
							2018-10-15 14:44:32 -06:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								83e72bb2f0 
								
							
								 
							
						 
						
							
							
								
								PR feedback pt. 1  
							
							 
							
							
							
						 
						
							2018-10-12 11:26:18 +01:00