Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0677fc1c4e 
								
							
								 
							
						 
						
							
							
								
								Comment  
							
							 
							
							
							
						 
						
							2016-03-23 13:25:22 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								34473a9c7f 
								
							
								 
							
						 
						
							
							
								
								Don't require alias in public room list.  
							
							 
							
							... 
							
							
							
							Rooms now no longer require an alias to be published.
Also, changes the way we pull out state of each room to not require
fetching all state events. 
							
						 
						
							2016-03-23 10:42:19 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3bb3f02517 
								
							
								 
							
						 
						
							
							
								
								Enable guest access for private rooms by default  
							
							 
							
							
							
						 
						
							2016-03-17 16:23:53 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								590fbbef03 
								
							
								 
							
						 
						
							
							
								
								Add config to create guest account on 3pid invite  
							
							 
							
							... 
							
							
							
							Currently, when a 3pid invite request is sent to an identity server, it
includes a provisioned guest access token. This allows the link in the,
say, invite email to include the guest access token ensuring that the
same account is used each time the link is clicked.
This flow has a number of flaws, including when using different servers
or servers that have guest access disabled.
For now, we keep this implementation but hide it behind a config option
until a better flow is implemented. 
							
						 
						
							2016-03-14 15:50:40 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								874fd43257 
								
							
								 
							
						 
						
							
							
								
								Send the user ID matching the guest access token, since there is no Matrix API to discover what user ID an access token is for.  
							
							 
							
							
							
						 
						
							2016-03-07 17:13:56 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								09b1d98070 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #623  from matrix-org/rav/fix_createroom_race  
							
							 
							
							... 
							
							
							
							Make sure we add all invited members before returning from createRoom 
							
						 
						
							2016-03-04 09:29:15 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								a92b4ea76f 
								
							
								 
							
						 
						
							
							
								
								Make sure we add all invited members before returning from createRoom  
							
							 
							
							... 
							
							
							
							add a missing yield. 
							
						 
						
							2016-03-04 00:06:03 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								a85179aff3 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into rav/SYN-642  
							
							 
							
							
							
						 
						
							2016-03-03 19:05:54 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								b4022cc487 
								
							
								 
							
						 
						
							
							
								
								Pass whole requester to ratelimiting  
							
							 
							
							... 
							
							
							
							This will enable more detailed decisions 
							
						 
						
							2016-03-03 16:43:42 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								74cd80e530 
								
							
								 
							
						 
						
							
							
								
								Fix typo  
							
							 
							
							
							
						 
						
							2016-03-03 10:28:58 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								fc1f932cc0 
								
							
								 
							
						 
						
							
							
								
								Move arg default to the start of the function  
							
							 
							
							... 
							
							
							
							Also don't overwrite the list that gets passed in. 
							
						 
						
							2016-03-02 16:44:14 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								9ff940a0ef 
								
							
								 
							
						 
						
							
							
								
								Address review comments  
							
							 
							
							
							
						 
						
							2016-03-02 15:40:30 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								8a1d3b86af 
								
							
								 
							
						 
						
							
							
								
								Handle rejections of invites from local users locally  
							
							 
							
							... 
							
							
							
							Slightly hacky fix to SYN-642, which avoids the federation codepath when trying
to reject invites from local users. 
							
						 
						
							2016-03-01 17:27:22 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								33300673b7 
								
							
								 
							
						 
						
							
							
								
								Generate guest access token on 3pid invites  
							
							 
							
							... 
							
							
							
							This means that following the same link across multiple sessions or
devices can re-use the same guest account.
Note that this is somewhat of an abuse vector; we can't throw up
captchas on this flow, so this is a way of registering ephemeral
accounts for spam, whose sign-up we don't rate limit. 
							
						 
						
							2016-02-24 14:41:25 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								577951b032 
								
							
								 
							
						 
						
							
							
								
								Allow third_party_signed to be specified on /join  
							
							 
							
							
							
						 
						
							2016-02-23 15:11:25 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								f8d21e1431 
								
							
								 
							
						 
						
							
							
								
								Review comments  
							
							 
							
							
							
						 
						
							2016-02-18 11:02:14 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								591af2d074 
								
							
								 
							
						 
						
							
							
								
								Some cleanup  
							
							 
							
							... 
							
							
							
							I'm not particularly happy with the "action" switching, but there's no
convenient way to defer the work that needs to happen after it, so... :( 
							
						 
						
							2016-02-17 15:50:13 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								a4e278bfe7 
								
							
								 
							
						 
						
							
							
								
								Respond to federated invite with non-empty context  
							
							 
							
							... 
							
							
							
							Currently, we magically perform an extra database hit to find the
inviter, and use this to guess where we should send the event. Instead,
fill in a valid context, so that other callers relying on the context
actually have one. 
							
						 
						
							2016-02-17 15:25:12 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								6605adf669 
								
							
								 
							
						 
						
							
							
								
								Some cleanup, some TODOs, more to do  
							
							 
							
							
							
						 
						
							2016-02-16 19:05:02 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								d1fb790818 
								
							
								 
							
						 
						
							
							
								
								Some cleanup  
							
							 
							
							
							
						 
						
							2016-02-16 14:25:23 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								1f403325ac 
								
							
								 
							
						 
						
							
							
								
								Tidy? up room creation event sending  
							
							 
							
							
							
						 
						
							2016-02-16 12:00:50 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								feedaa37fa 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into daniel/roomcleanupincremental  
							
							 
							
							... 
							
							
							
							Conflicts:
	synapse/handlers/room.py 
							
						 
						
							2016-02-16 11:34:48 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								4bfb32f685 
								
							
								 
							
						 
						
							
							
								
								Branch off member and non member sends  
							
							 
							
							... 
							
							
							
							Unclean, needs tidy-up, but works 
							
						 
						
							2016-02-15 18:21:30 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								1a2197d7bf 
								
							
								 
							
						 
						
							
							
								
								Simplify room creation code  
							
							 
							
							
							
						 
						
							2016-02-15 18:19:01 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								e560045cfd 
								
							
								 
							
						 
						
							
							
								
								Simplify room creation code  
							
							 
							
							
							
						 
						
							2016-02-15 18:18:39 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								8168341e9b 
								
							
								 
							
						 
						
							
							
								
								Use update_membership for profile updates  
							
							 
							
							
							
						 
						
							2016-02-15 17:14:34 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								1bbb67c452 
								
							
								 
							
						 
						
							
							
								
								Use update_membership to kick guests  
							
							 
							
							
							
						 
						
							2016-02-15 16:40:22 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								150fcde0dc 
								
							
								 
							
						 
						
							
							
								
								Reuse update_membership from /join  
							
							 
							
							
							
						 
						
							2016-02-15 16:16:03 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								73e616df2a 
								
							
								 
							
						 
						
							
							
								
								Inline _do_local_membership_update  
							
							 
							
							
							
						 
						
							2016-02-15 16:02:22 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								f318d4f2a4 
								
							
								 
							
						 
						
							
							
								
								Inline _do_join as it now only has one caller  
							
							 
							
							... 
							
							
							
							Also, consistently apply rate limiting.
Again, ugly, but a step in the right direction. 
							
						 
						
							2016-02-15 15:57:10 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								e71095801f 
								
							
								 
							
						 
						
							
							
								
								Merge implementation of /join by alias or ID  
							
							 
							
							... 
							
							
							
							This code is kind of rough (passing the remote servers down a long
chain), but is a step towards improvement. 
							
						 
						
							2016-02-15 15:39:16 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								dbeed36dec 
								
							
								 
							
						 
						
							
							
								
								Merge some room joining codepaths  
							
							 
							
							... 
							
							
							
							Force joining by alias to go through the send_membership_event checks,
rather than bypassing them straight into _do_join. This is the first of
many stages of cleanup. 
							
						 
						
							2016-02-15 14:38:27 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								4de08a4672 
								
							
								 
							
						 
						
							
							
								
								Revert "Merge two of the room join codepaths"  
							
							 
							
							... 
							
							
							
							This reverts commit cf81375b94 .
It subtly violates a guest joining auth check 
							
						 
						
							2016-02-12 16:17:24 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								cf81375b94 
								
							
								 
							
						 
						
							
							
								
								Merge two of the room join codepaths  
							
							 
							
							... 
							
							
							
							There's at least one more to merge in.
Side-effects:
 * Stop reporting None as displayname and avatar_url in some cases
 * Joining a room by alias populates guest-ness in join event
 * Remove unspec'd PUT version of /join/<room_id_or_alias> which has not
   been called on matrix.org according to logs
 * Stop recording access_token_id on /join/room_id - currently we don't
   record it on /join/room_alias; I can try to thread it through at some
   point. 
							
						 
						
							2016-02-12 15:11:49 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0eff740523 
								
							
								 
							
						 
						
							
							
								
								Return events in correct order for /events  
							
							 
							
							
							
						 
						
							2016-02-11 10:07:27 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2c1fbea531 
								
							
								 
							
						 
						
							
							
								
								Fix up logcontexts  
							
							 
							
							
							
						 
						
							2016-02-08 14:26:45 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9cd80a7b5c 
								
							
								 
							
						 
						
							
							
								
								PEP8  
							
							 
							
							
							
						 
						
							2016-02-03 11:52:57 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								772b45c745 
								
							
								 
							
						 
						
							
							
								
								Remove unused method  
							
							 
							
							
							
						 
						
							2016-02-03 11:43:26 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6f52e90065 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/public_room_fix  
							
							 
							
							
							
						 
						
							2016-02-03 11:06:29 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								d83d004ccd 
								
							
								 
							
						 
						
							
							
								
								Fix flake8 warnings for new flake8  
							
							 
							
							
							
						 
						
							2016-02-02 17:18:50 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8a391e33ae 
								
							
								 
							
						 
						
							
							
								
								s/get_room_changes_for_user/get_membership_changes_for_user/  
							
							 
							
							
							
						 
						
							2016-02-02 16:12:10 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								65e92eca49 
								
							
								 
							
						 
						
							
							
								
								Change the way we do public room list fetching  
							
							 
							
							
							
						 
						
							2016-02-02 15:21:10 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b023995538 
								
							
								 
							
						 
						
							
							
								
								WARN if we get a topo token instead of stream.  
							
							 
							
							
							
						 
						
							2016-02-02 14:11:14 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								89b40b225c 
								
							
								 
							
						 
						
							
							
								
								Order things correctly  
							
							 
							
							
							
						 
						
							2016-02-01 16:32:46 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4bf448be25 
								
							
								 
							
						 
						
							
							
								
								Switch over /events to use per room caches  
							
							 
							
							
							
						 
						
							2016-02-01 16:26:51 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								da417aa56d 
								
							
								 
							
						 
						
							
							
								
								Allow non-guests to peek on rooms using /events  
							
							 
							
							
							
						 
						
							2016-01-20 15:34:07 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								ac5a4477ad 
								
							
								 
							
						 
						
							
							
								
								Require unbanning before other membership changes  
							
							 
							
							
							
						 
						
							2016-01-15 16:27:26 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								b5ce4f0427 
								
							
								 
							
						 
						
							
							
								
								Remove unused parameters  
							
							 
							
							
							
						 
						
							2016-01-15 13:54:03 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								2978053d16 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'release-v0.12.1' into develop  
							
							 
							
							
							
						 
						
							2016-01-14 15:04:08 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								49f33f6438 
								
							
								 
							
						 
						
							
							
								
								Add 'event' result to 'context' endpoint  
							
							 
							
							... 
							
							
							
							... because the context isn't much use without the event. 
							
						 
						
							2016-01-13 16:42:14 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								93afb40cd4 
								
							
								 
							
						 
						
							
							
								
								Skip, rather than erroring, invalid guest requests  
							
							 
							
							... 
							
							
							
							Erroring causes problems when people make illegal requests, because they
don't know what limit parameter they should pass.
This is definitely buggy. It leaks message counts for rooms people don't
have permission to see, via tokens. But apparently we already
consciously decided to allow that as a team, so this preserves that
behaviour. 
							
						 
						
							2016-01-13 16:41:42 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								2ef6de928d 
								
							
								 
							
						 
						
							
							
								
								Skip, rather than erroring, invalid guest requests  
							
							 
							
							... 
							
							
							
							Erroring causes problems when people make illegal requests, because they
don't know what limit parameter they should pass.
This is definitely buggy. It leaks message counts for rooms people don't
have permission to see, via tokens. But apparently we already
consciously decided to allow that as a team, so this preserves that
behaviour. 
							
						 
						
							2016-01-05 18:12:37 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								cfd07aafff 
								
							
								 
							
						 
						
							
							
								
								Allow guests to upgrade their accounts  
							
							 
							
							
							
						 
						
							2016-01-05 18:01:18 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c3ea36304b 
								
							
								 
							
						 
						
							
							
								
								Use named args  
							
							 
							
							
							
						 
						
							2016-01-05 12:57:45 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								1b5642604b 
								
							
								 
							
						 
						
							
							
								
								Support inviting 3pids in /createRoom  
							
							 
							
							
							
						 
						
							2016-01-05 11:56:21 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								7f3148865c 
								
							
								 
							
						 
						
							
							
								
								Return room avatar URLs in /publicRooms  
							
							 
							
							... 
							
							
							
							Spec: https://github.com/matrix-org/matrix-doc/pull/244 
Tests: https://github.com/matrix-org/sytest/pull/121  
							
						 
						
							2015-12-21 19:38:04 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								0311612ce9 
								
							
								 
							
						 
						
							
							
								
								Give the IS a bunch more 3pid invite context  
							
							 
							
							... 
							
							
							
							This allows it to form richer emails 
							
						 
						
							2015-12-16 13:05:32 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								7d6b313312 
								
							
								 
							
						 
						
							
							
								
								Add caches for whether a room has been forgotten by a user  
							
							 
							
							
							
						 
						
							2015-12-10 17:49:34 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								c30cdb0d68 
								
							
								 
							
						 
						
							
							
								
								Add comments  
							
							 
							
							
							
						 
						
							2015-12-02 10:49:35 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								2a0ec3b89d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into markjh/edu_frequency  
							
							 
							
							... 
							
							
							
							Conflicts:
	synapse/handlers/federation.py
	synapse/handlers/room.py 
							
						 
						
							2015-12-02 10:40:22 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								a9526831a4 
								
							
								 
							
						 
						
							
							
								
								Wrap calls to distributor.fire in appropriately named functions so that static analysis can work out want is calling what  
							
							 
							
							
							
						 
						
							2015-12-01 20:53:04 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								3d3da2b460 
								
							
								 
							
						 
						
							
							
								
								Only fire user_joined_room on the distributor if the user has actually joined the room  
							
							 
							
							
							
						 
						
							2015-12-01 16:03:08 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								ba26eb3d5d 
								
							
								 
							
						 
						
							
							
								
								Allow users to forget rooms  
							
							 
							
							
							
						 
						
							2015-11-17 17:17:30 -05:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c0b3554401 
								
							
								 
							
						 
						
							
							
								
								Fix missing profile data in federation joins  
							
							 
							
							... 
							
							
							
							There was a regression where we stopped including profile data in
initial joins for rooms joined over federation. 
							
						 
						
							2015-11-12 16:19:55 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								e93d550b79 
								
							
								 
							
						 
						
							
							
								
								Allow guests to access room context API  
							
							 
							
							
							
						 
						
							2015-11-11 17:49:44 +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
							
						 
						
							 
							
							
							
								
							
								0d63dc3ec9 
								
							
								 
							
						 
						
							
							
								
								Get display name from identity server, not client  
							
							 
							
							
							
						 
						
							2015-11-09 17:26:43 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								2cebe53545 
								
							
								 
							
						 
						
							
							
								
								Exchange 3pid invites for m.room.member invites  
							
							 
							
							
							
						 
						
							2015-11-05 16:43:19 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								ca2f90742d 
								
							
								 
							
						 
						
							
							
								
								Open up /events to anonymous users for room events only  
							
							 
							
							... 
							
							
							
							Squash-merge of PR #345  from daniel/anonymousevents 
							
						 
						
							2015-11-05 14:32:26 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								771ca56c88 
								
							
								 
							
						 
						
							
							
								
								Remove more unused parameters  
							
							 
							
							
							
						 
						
							2015-11-02 15:31:57 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								56dbcd1524 
								
							
								 
							
						 
						
							
							
								
								Docs  
							
							 
							
							
							
						 
						
							2015-10-28 14:05:50 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5cb298c934 
								
							
								 
							
						 
						
							
							
								
								Add room context api  
							
							 
							
							
							
						 
						
							2015-10-28 13:45:56 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								137fafce4e 
								
							
								 
							
						 
						
							
							
								
								Allow rejecting invites  
							
							 
							
							... 
							
							
							
							This is done by using the same /leave flow as you would use if you had
already accepted the invite and wanted to leave. 
							
						 
						
							2015-10-20 11:58:58 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								b8dd5b1a2d 
								
							
								 
							
						 
						
							
							
								
								Verify third party ID server certificates  
							
							 
							
							
							
						 
						
							2015-10-16 14:54:54 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								6ffbcf45c6 
								
							
								 
							
						 
						
							
							
								
								Use non-placeholder name for endpoint  
							
							 
							
							
							
						 
						
							2015-10-15 13:12:52 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								643b5fcdc8 
								
							
								 
							
						 
						
							
							
								
								Look for keys on the right objects  
							
							 
							
							
							
						 
						
							2015-10-15 13:10:30 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								14edea1aff 
								
							
								 
							
						 
						
							
							
								
								Move logic into handler  
							
							 
							
							
							
						 
						
							2015-10-13 17:47:58 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								17dffef5ec 
								
							
								 
							
						 
						
							
							
								
								Move event contents into third_party_layout field  
							
							 
							
							
							
						 
						
							2015-10-13 15:48:12 +01: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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d5e081c7ae 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable  
							
							 
							
							
							
						 
						
							2015-10-02 10:33:49 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								5b3e9713dd 
								
							
								 
							
						 
						
							
							
								
								Implement third party identifier invites  
							
							 
							
							
							
						 
						
							2015-10-01 17:49:52 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0ec78b360c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #287  from matrix-org/erikj/canonical_alias  
							
							 
							
							... 
							
							
							
							Set m.room.canonical_alias on room creation. 
							
						 
						
							2015-09-30 17:14:55 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ecd0c0dfc5 
								
							
								 
							
						 
						
							
							
								
								Remove double indentation  
							
							 
							
							
							
						 
						
							2015-09-30 16:46:24 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								301141515a 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #288  from matrix-org/markjh/unused_definitions  
							
							 
							
							... 
							
							
							
							Remove some of the unused definitions from synapse 
							
						 
						
							2015-09-28 14:22:44 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								57338a9768 
								
							
								 
							
						 
						
							
							
								
								synapse/handlers/room.py:_should_invite_join was unused  
							
							 
							
							
							
						 
						
							2015-09-23 10:26:45 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								257fa1c53e 
								
							
								 
							
						 
						
							
							
								
								Set m.room.canonical_alias on room creation.  
							
							 
							
							
							
						 
						
							2015-09-23 10:07:31 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								dc6094b908 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #271  from matrix-org/erikj/default_history  
							
							 
							
							... 
							
							
							
							Change default history visibility for private rooms 
							
						 
						
							2015-09-23 09:21:00 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								3c166a24c5 
								
							
								 
							
						 
						
							
							
								
								Remove undocumented and unimplemented 'feedback' parameter from the Client-Server API  
							
							 
							
							
							
						 
						
							2015-09-09 16:05:09 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								bc8b25eb56 
								
							
								 
							
						 
						
							
							
								
								Allow users that have left the room to view the member list from the point they left  
							
							 
							
							
							
						 
						
							2015-09-09 15:42:16 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e530208e68 
								
							
								 
							
						 
						
							
							
								
								Change default history visibility for private rooms  
							
							 
							
							
							
						 
						
							2015-09-09 09:57:49 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a88e16152f 
								
							
								 
							
						 
						
							
							
								
								Add flag which disables federation of the room  
							
							 
							
							
							
						 
						
							2015-09-01 15:47:30 +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
							
						 
						
							 
							
							
							
								
							
								cbd053bb8f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #233  from matrix-org/erikj/canonical_alias  
							
							 
							
							... 
							
							
							
							Add server side support for canonical aliases 
							
						 
						
							2015-08-20 11:26:09 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								daa01842f8 
								
							
								 
							
						 
						
							
							
								
								Don't get apservice interested rooms in RoomHandler.get_joined_rooms_for_users  
							
							 
							
							
							
						 
						
							2015-08-19 13:46:03 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d7272f8d9d 
								
							
								 
							
						 
						
							
							
								
								Add canonical alias to the default power levels  
							
							 
							
							
							
						 
						
							2015-08-19 12:03:09 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c456d17daf 
								
							
								 
							
						 
						
							
							
								
								Implement specifying custom initial state for /createRoom  
							
							 
							
							
							
						 
						
							2015-07-16 15:25:29 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								002a44ac1a 
								
							
								 
							
						 
						
							
							
								
								s/everyone_ops/original_invitees_have_ops/  
							
							 
							
							
							
						 
						
							2015-07-14 10:37:42 +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