d240796ded 
								
							
								 
							
						 
						
							
							
								
								Basic, un-cached support for secondary_directory_servers  
							
							
							
						 
						
							2016-05-31 17:20:07 +01:00  
				
					
						
							
							
								 
						
							
							
								887c6e6f05 
								
							
								 
							
						 
						
							
							
								
								Split out the room list handler  
							
							... 
							
							
							
							So I can use it from federation bits without pulling in all the handlers. 
							
						 
						
							2016-05-31 11:05:16 +01:00  
				
					
						
							
							
								 
						
							
							
								332d7e9b97 
								
							
								 
							
						 
						
							
							
								
								Allow clients to specify a server_name to avoid 'No known servers'  
							
							... 
							
							
							
							Multiple server_names are supported via ?server_name=foo&server_name=bar 
							
						 
						
							2016-05-19 13:50:52 +01:00  
				
					
						
							
							
								 
						
							
							
								0cb441fedd 
								
							
								 
							
						 
						
							
							
								
								Move typing handler out of the Handlers object  
							
							
							
						 
						
							2016-05-17 15:58:46 +01:00  
				
					
						
							
							
								 
						
							
							
								3b86ecfa79 
								
							
								 
							
						 
						
							
							
								
								Move the presence handler out of the Handlers object  
							
							
							
						 
						
							2016-05-16 18:56:37 +01:00  
				
					
						
							
							
								 
						
							
							
								08a8514b7a 
								
							
								 
							
						 
						
							
							
								
								Remove spurious comment  
							
							
							
						 
						
							2016-03-30 15:05:33 +01:00  
				
					
						
							
							
								 
						
							
							
								fddb6fddc1 
								
							
								 
							
						 
						
							
							
								
								Require user to have left room to forget room  
							
							... 
							
							
							
							This dramatically simplifies the forget API code - in particular it no
longer generates a leave event. 
							
						 
						
							2016-03-30 11:03:00 +01:00  
				
					
						
							
							
								 
						
							
							
								e9c1cabac2 
								
							
								 
							
						 
						
							
							
								
								Use parse_json_object_from_request to parse JSON out of request bodies  
							
							
							
						 
						
							2016-03-11 16:41:03 +00:00  
				
					
						
							
							
								 
						
							
							
								b7dbe5147a 
								
							
								 
							
						 
						
							
							
								
								Add a parse_json_object function  
							
							... 
							
							
							
							to deduplicate all the copy+pasted _parse_json functions. Also document
the parse_.* functions. 
							
						 
						
							2016-03-09 11:26:26 +00:00  
				
					
						
							
							
								 
						
							
							
								7076082ae6 
								
							
								 
							
						 
						
							
							
								
								Fix relative imports so they work in both py3 and py27  
							
							
							
						 
						
							2016-03-08 11:45:50 +00:00  
				
					
						
							
							
								 
						
							
							
								b4022cc487 
								
							
								 
							
						 
						
							
							
								
								Pass whole requester to ratelimiting  
							
							... 
							
							
							
							This will enable more detailed decisions 
							
						 
						
							2016-03-03 16:43:42 +00:00  
				
					
						
							
							
								 
						
							
							
								869580206d 
								
							
								 
							
						 
						
							
							
								
								Ignore invalid POST bodies when joining rooms  
							
							
							
						 
						
							2016-02-24 08:50:28 +00:00  
				
					
						
							
							
								 
						
							
							
								577951b032 
								
							
								 
							
						 
						
							
							
								
								Allow third_party_signed to be specified on /join  
							
							
							
						 
						
							2016-02-23 15:11:25 +00:00  
				
					
						
							
							
								 
						
							
							
								e5ad2e5267 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #582  from matrix-org/erikj/presence  
							
							... 
							
							
							
							Rewrite presence for performance. 
							
						 
						
							2016-02-19 09:37:50 +00:00  
				
					
						
							
							
								 
						
							
							
								7e90fb6a57 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into daniel/roomcleanupincremental  
							
							... 
							
							
							
							Conflicts:
	synapse/rest/client/v1/room.py 
							
						 
						
							2016-02-17 15:53:59 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								e5999bfb1a 
								
							
								 
							
						 
						
							
							
								
								Initial cut  
							
							
							
						 
						
							2016-02-17 15:40:50 +00:00  
				
					
						
							
							
								 
						
							
							
								71d5d2c669 
								
							
								 
							
						 
						
							
							
								
								client/v1/room: include event_id in response to state event PUT, in accordance with the spec  
							
							... 
							
							
							
							Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> 
							
						 
						
							2016-02-17 11:53:43 +01:00  
				
					
						
							
							
								 
						
							
							
								4bfb32f685 
								
							
								 
							
						 
						
							
							
								
								Branch off member and non member sends  
							
							... 
							
							
							
							Unclean, needs tidy-up, but works 
							
						 
						
							2016-02-15 18:21:30 +00:00  
				
					
						
							
							
								 
						
							
							
								1a2197d7bf 
								
							
								 
							
						 
						
							
							
								
								Simplify room creation code  
							
							
							
						 
						
							2016-02-15 18:19:01 +00:00  
				
					
						
							
							
								 
						
							
							
								e560045cfd 
								
							
								 
							
						 
						
							
							
								
								Simplify room creation code  
							
							
							
						 
						
							2016-02-15 18:18:39 +00:00  
				
					
						
							
							
								 
						
							
							
								150fcde0dc 
								
							
								 
							
						 
						
							
							
								
								Reuse update_membership from /join  
							
							
							
						 
						
							2016-02-15 16:16:03 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								4de08a4672 
								
							
								 
							
						 
						
							
							
								
								Revert "Merge two of the room join codepaths"  
							
							... 
							
							
							
							This reverts commit cf81375b94 
							
						 
						
							2016-02-12 16:17:24 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								709e09e1c3 
								
							
								 
							
						 
						
							
							
								
								Remove old log line  
							
							
							
						 
						
							2016-02-03 16:32:20 +00:00  
				
					
						
							
							
								 
						
							
							
								da417aa56d 
								
							
								 
							
						 
						
							
							
								
								Allow non-guests to peek on rooms using /events  
							
							
							
						 
						
							2016-01-20 15:34:07 +00:00  
				
					
						
							
							
								 
						
							
							
								ac5a4477ad 
								
							
								 
							
						 
						
							
							
								
								Require unbanning before other membership changes  
							
							
							
						 
						
							2016-01-15 16:27:26 +00:00  
				
					
						
							
							
								 
						
							
							
								2978053d16 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'release-v0.12.1' into develop  
							
							
							
						 
						
							2016-01-14 15:04:08 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								2110e35fd6 
								
							
								 
							
						 
						
							
							
								
								Introduce a Requester object  
							
							... 
							
							
							
							This tracks data about the entity which made the request. This is
instead of passing around a tuple, which requires call-site
modifications every time a new piece of optional context is passed
around.
I tried to introduce a User object. I gave up. 
							
						 
						
							2016-01-11 17:48:45 +00:00  
				
					
						
							
							
								 
						
							
							
								6c28ac260c 
								
							
								 
							
						 
						
							
							
								
								copyrights  
							
							
							
						 
						
							2016-01-07 04:26:29 +00:00  
				
					
						
							
							
								 
						
							
							
								515548a47a 
								
							
								 
							
						 
						
							
							
								
								Missing yield  
							
							
							
						 
						
							2015-12-10 17:54:23 +00:00  
				
					
						
							
							
								 
						
							
							
								872c134807 
								
							
								 
							
						 
						
							
							
								
								Update endpoints to reflect current spec  
							
							
							
						 
						
							2015-12-02 15:45:04 +00:00  
				
					
						
							
							
								 
						
							
							
								14d7acfad4 
								
							
								 
							
						 
						
							
							
								
								Host /unstable and /r0 versions of r0 APIs  
							
							
							
						 
						
							2015-12-01 17:34:32 +00:00  
				
					
						
							
							
								 
						
							
							
								ba26eb3d5d 
								
							
								 
							
						 
						
							
							
								
								Allow users to forget rooms  
							
							
							
						 
						
							2015-11-17 17:17:30 -05:00  
				
					
						
							
							
								 
						
							
							
								9c3f4f8dfd 
								
							
								 
							
						 
						
							
							
								
								Allow guests to /room/:room_id/{join,leave}  
							
							
							
						 
						
							2015-11-13 11:56:58 +00:00  
				
					
						
							
							
								 
						
							
							
								0d08670f61 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #360  from matrix-org/daniel/guestroominitialsync  
							
							... 
							
							
							
							Merge pull request #360  from matrix-org/daniel/guestroominitialsync
Allow guest access to room initialSync 
							
						 
						
							2015-11-12 15:19:55 +00:00  
				
					
						
							
							
								 
						
							
							
								e93d550b79 
								
							
								 
							
						 
						
							
							
								
								Allow guests to access room context API  
							
							
							
						 
						
							2015-11-11 17:49:44 +00:00  
				
					
						
							
							
								 
						
							
							
								f15ba926cc 
								
							
								 
							
						 
						
							
							
								
								Allow guest access to room initialSync  
							
							
							
						 
						
							2015-11-11 17:13:24 +00:00  
				
					
						
							
							
								 
						
							
							
								38d82edf0e 
								
							
								 
							
						 
						
							
							
								
								Allow guest users to join and message rooms  
							
							
							
						 
						
							2015-11-10 16:57:13 +00:00  
				
					
						
							
							
								 
						
							
							
								82e8a2d763 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #356  from matrix-org/daniel/3pidyetagain  
							
							... 
							
							
							
							Get display name from identity server, not client 
							
						 
						
							2015-11-10 12:44:17 +00:00  
				
					
						
							
							
								 
						
							
							
								0d63dc3ec9 
								
							
								 
							
						 
						
							
							
								
								Get display name from identity server, not client  
							
							
							
						 
						
							2015-11-09 17:26:43 +00:00  
				
					
						
							
							
								 
						
							
							
								9107ed23b7 
								
							
								 
							
						 
						
							
							
								
								Add a couple of unit tests for room/<x>/messages  
							
							... 
							
							
							
							... merely because I was trying to figure out how it worked, and couldn't. 
							
						 
						
							2015-11-09 16:16:43 +00:00  
				
					
						
							
							
								 
						
							
							
								6be1b4b113 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #350  from matrix-org/erikj/search  
							
							... 
							
							
							
							Implement pagination, order by and groups in search 
							
						 
						
							2015-11-05 17:52:32 +00:00  
				
					
						
							
							
								 
						
							
							
								2cebe53545 
								
							
								 
							
						 
						
							
							
								
								Exchange 3pid invites for m.room.member invites  
							
							
							
						 
						
							2015-11-05 16:43:19 +00:00  
				
					
						
							
							
								 
						
							
							
								729ea933ea 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search  
							
							
							
						 
						
							2015-11-05 15:43:52 +00:00  
				
					
						
							
							
								 
						
							
							
								7301e05122 
								
							
								 
							
						 
						
							
							
								
								Implement basic pagination for search results  
							
							
							
						 
						
							2015-11-05 15:04:08 +00:00  
				
					
						
							
							
								 
						
							
							
								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