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
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								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  
						
					 
				
					
						
							
							
								 
								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  
						
					 
				
					
						
							
							
								 
								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  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								9ec56d6935 
								
							
								 
							
						 
						
							
							
								
								ALL_USER_TYPES should be a tuple  
							
							 
							
							
							
						 
						
							2019-01-15 14:38:15 +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
							
						 
						
							 
							
							
								
								
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								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
							
						 
						
							 
							
							
							
								
							
								fd99787162 
								
							
								 
							
						 
						
							
							
								
								Incorporate Dave's work for GDPR login flows  
							
							 
							
							... 
							
							
							
							As per https://github.com/vector-im/riot-web/issues/7168#issuecomment-419996117  
							
						 
						
							2018-10-03 15:57:42 -06:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								fd2dbf1836 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking  
							
							 
							
							
							
						 
						
							2018-08-22 17:06:10 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9643a6f7f2 
								
							
								 
							
						 
						
							
							
								
								Update notice format  
							
							 
							
							
							
						 
						
							2018-08-22 17:00:29 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								c24fc9797b 
								
							
								 
							
						 
						
							
							
								
								add new event types  
							
							 
							
							
							
						 
						
							2018-08-15 15:04:30 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								9b75c78b4d 
								
							
								 
							
						 
						
							
							
								
								support server notice state events for resource limits  
							
							 
							
							
							
						 
						
							2018-08-14 11:20:41 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								152c0aa58e 
								
							
								 
							
						 
						
							
							
								
								Add constants for room versions  
							
							 
							
							
							
						 
						
							2018-08-09 14:55:47 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								3523f5432a 
								
							
								 
							
						 
						
							
							
								
								Don't expose default_room_version as config opt  
							
							 
							
							
							
						 
						
							2018-08-07 12:51:57 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								0ca459ea33 
								
							
								 
							
						 
						
							
							
								
								Basic support for room versioning  
							
							 
							
							... 
							
							
							
							This is the first tranche of support for room versioning. It includes:
 * setting the default room version in the config file
 * new room_version param on the createRoom API
 * storing the version of newly-created rooms in the m.room.create event
 * fishing the version of existing rooms out of the m.room.create event 
							
						 
						
							2018-08-03 16:08:32 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								3cf3e08a97 
								
							
								 
							
						 
						
							
							
								
								Implementation of server_acls  
							
							 
							
							... 
							
							
							
							... as described at
https://docs.google.com/document/d/1EttUVzjc2DWe2ciw4XPtNpUpIl9lWXGEsy2ewDS7rtw . 
							
						 
						
							2018-07-04 19:06:20 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								33f469ba19 
								
							
								 
							
						 
						
							
							
								
								Apply some limits to depth to counter abuse  
							
							 
							
							... 
							
							
							
							* When creating a new event, cap its depth to 2^63 - 1
* When receiving events, reject any without a sensible depth
As per https://docs.google.com/document/d/1I3fi2S-XnpO45qrpCsowZv8P8dHcNZ4fsBsbOW7KABI  
							
						 
						
							2018-05-01 17:54:19 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								73a5f06652 
								
							
								 
							
						 
						
							
							
								
								Support registration / login with phone number  
							
							 
							
							... 
							
							
							
							Changes from https://github.com/matrix-org/synapse/pull/1971  
							
						 
						
							2017-03-13 17:27:51 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								7eae6eaa2f 
								
							
								 
							
						 
						
							
							
								
								Revert "Support registration & login with phone number"  
							
							 
							
							
							
						 
						
							2017-03-13 09:59:33 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								ce3e583d94 
								
							
								 
							
						 
						
							
							
								
								WIP support for msisdn 3pid proxy methods  
							
							 
							
							
							
						 
						
							2017-02-14 15:05:55 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								063a1251a9 
								
							
								 
							
						 
						
							
							
								
								Remove a few aspirational but unused constants  
							
							 
							
							... 
							
							
							
							from the Kegan era 
							
						 
						
							2017-02-08 11:36:08 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								1294d4a329 
								
							
								 
							
						 
						
							
							
								
								Move ThirdPartyEntityKind into api.constants so the expectation becomes that the value is significant  
							
							 
							
							
							
						 
						
							2016-08-25 18:34:47 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								114b929f8b 
								
							
								 
							
						 
						
							
							
								
								Check presence state is a valid one  
							
							 
							
							
							
						 
						
							2016-02-18 09:16:32 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								6c28ac260c 
								
							
								 
							
						 
						
							
							
								
								copyrights  
							
							 
							
							
							
						 
						
							2016-01-07 04:26:29 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								38d82edf0e 
								
							
								 
							
						 
						
							
							
								
								Allow guest users to join and message rooms  
							
							 
							
							
							
						 
						
							2015-11-10 16:57:13 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								58e6a58eb7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into daniel/3pidinvites  
							
							 
							
							
							
						 
						
							2015-10-05 10:33:41 -05:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								40017a9a11 
								
							
								 
							
						 
						
							
							
								
								Add 'trusted_private_chat' to room creation presets  
							
							 
							
							
							
						 
						
							2015-10-02 11:22:56 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								5b3e9713dd 
								
							
								 
							
						 
						
							
							
								
								Implement third party identifier invites  
							
							 
							
							
							
						 
						
							2015-10-01 17:49:52 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								3c166a24c5 
								
							
								 
							
						 
						
							
							
								
								Remove undocumented and unimplemented 'feedback' parameter from the Client-Server API  
							
							 
							
							
							
						 
						
							2015-09-09 16:05:09 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9b63def388 
								
							
								 
							
						 
						
							
							
								
								Add m.room.avatar to default power levels. Change default required power levels of such events to 50  
							
							 
							
							
							
						 
						
							2015-08-20 14:35:40 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d7272f8d9d 
								
							
								 
							
						 
						
							
							
								
								Add canonical alias to the default power levels  
							
							 
							
							
							
						 
						
							2015-08-19 12:03:09 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b49a30a972 
								
							
								 
							
						 
						
							
							
								
								Capitalize contants  
							
							 
							
							
							
						 
						
							2015-07-14 10:20:31 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d5cc794598 
								
							
								 
							
						 
						
							
							
								
								Implement presets at room creation  
							
							 
							
							
							
						 
						
							2015-07-13 16:56:08 +01:00