Mark Haines
							
						 
						
							 
							
							
							
								
							
								b7a3be693b 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #618  from matrix-org/markjh/pushrule_stream  
							
							 
							
							... 
							
							
							
							Add a stream for push rule updates 
							
						 
						
							2016-03-04 16:35:08 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								13cbd31040 
								
							
								 
							
						 
						
							
							
								
								Spelling  
							
							 
							
							
							
						 
						
							2016-03-04 15:22:39 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								ec7460b4f2 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into markjh/pushrule_stream  
							
							 
							
							
							
						 
						
							2016-03-04 14:44:34 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ed61a49169 
								
							
								 
							
						 
						
							
							
								
								Add profile information to invites  
							
							 
							
							
							
						 
						
							2016-03-04 14:35:02 +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  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								ddf9e7b302 
								
							
								 
							
						 
						
							
							
								
								Hook up the push rules to the notifier  
							
							 
							
							
							
						 
						
							2016-03-03 14:57:45 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e5ad2e5267 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #582  from matrix-org/erikj/presence  
							
							 
							
							... 
							
							
							
							Rewrite presence for performance. 
							
						 
						
							2016-02-19 09:37:50 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								f8d21e1431 
								
							
								 
							
						 
						
							
							
								
								Review comments  
							
							 
							
							
							
						 
						
							2016-02-18 11:02:14 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e5999bfb1a 
								
							
								 
							
						 
						
							
							
								
								Initial cut  
							
							 
							
							
							
						 
						
							2016-02-17 15:40:50 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								d1fb790818 
								
							
								 
							
						 
						
							
							
								
								Some cleanup  
							
							 
							
							
							
						 
						
							2016-02-16 14:25:23 +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
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4e7948b47a 
								
							
								 
							
						 
						
							
							
								
								Allow paginating backwards from stream token  
							
							 
							
							
							
						 
						
							2016-01-28 11:52:34 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								5cba88ea7c 
								
							
								 
							
						 
						
							
							
								
								Make it possible to paginate forwards from stream tokens  
							
							 
							
							... 
							
							
							
							In order that we can fill the gap after a /sync, make it possible to paginate
forwards from a stream token. 
							
						 
						
							2016-01-27 17:42:45 +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
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								517fb9a023 
								
							
								 
							
						 
						
							
							
								
								Move the doc string to the public facing method  
							
							 
							
							
							
						 
						
							2015-12-22 18:53:47 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								9ac417fa88 
								
							
								 
							
						 
						
							
							
								
								Add a cache for initialSync responses that expires after 5 minutes  
							
							 
							
							
							
						 
						
							2015-12-22 18:27:56 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								491f3d16dc 
								
							
								 
							
						 
						
							
							
								
								Make state updates in the C+S API idempotent  
							
							 
							
							
							
						 
						
							2015-12-02 15:50:50 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								5eb4d13aaa 
								
							
								 
							
						 
						
							
							
								
								Fix typo in collect_presencelike_data  
							
							 
							
							
							
						 
						
							2015-12-02 10:50:58 +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
							
						 
						
							 
							
							
							
								
							
								95f30ecd1f 
								
							
								 
							
						 
						
							
							
								
								Add API for setting account_data globaly or on a per room basis  
							
							 
							
							
							
						 
						
							2015-12-01 18:41:32 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								924d85a75e 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #375  from matrix-org/daniel/guestroominitialsync  
							
							 
							
							... 
							
							
							
							Clean up room initialSync for guest users 
							
						 
						
							2015-11-23 16:10:49 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								1c960fbb80 
								
							
								 
							
						 
						
							
							
								
								s/private_user_data/account_data/  
							
							 
							
							
							
						 
						
							2015-11-18 15:31:04 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								641420c5e0 
								
							
								 
							
						 
						
							
							
								
								Clean up room initialSync for guest users  
							
							 
							
							
							
						 
						
							2015-11-13 15:44:57 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								06bfd0a3c0 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #367  from matrix-org/daniel/readafterleave  
							
							 
							
							... 
							
							
							
							Merge pull request #367  from matrix-org/daniel/readafterleave
Tweak guest access permissions 
							
						 
						
							2015-11-12 15:22:02 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								fb7e260a20 
								
							
								 
							
						 
						
							
							
								
								Tweak guest access permissions  
							
							 
							
							... 
							
							
							
							* Allow world_readable rooms to be read by guests who have joined and
   left
 * Allow regular users to access world_readable rooms 
							
						 
						
							2015-11-12 15:02:00 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								50f1afbd5b 
								
							
								 
							
						 
						
							
							
								
								Consider joined guest users as joined users  
							
							 
							
							... 
							
							
							
							Otherwise they're inconveniently allowed to write events to the room
but not to read them from the room. 
							
						 
						
							2015-11-12 13:37:07 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								f15ba926cc 
								
							
								 
							
						 
						
							
							
								
								Allow guest access to room initialSync  
							
							 
							
							
							
						 
						
							2015-11-11 17:13:24 +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
							
						 
						
							 
							
							
							
								
							
								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
							
						 
						
							 
							
							
							
								
							
								f522f50a08 
								
							
								 
							
						 
						
							
							
								
								Allow guests to register and call /events?room_id=  
							
							 
							
							... 
							
							
							
							This follows the same flows-based flow as regular registration, but as
the only implemented flow has no requirements, it auto-succeeds. In the
future, other flows (e.g. captcha) may be required, so clients should
treat this like the regular registration flow choices. 
							
						 
						
							2015-11-04 17:29:07 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								ddd8566f41 
								
							
								 
							
						 
						
							
							
								
								Store room tag content and return the content in the m.tag event  
							
							 
							
							
							
						 
						
							2015-11-02 15:11:31 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								79b65f3875 
								
							
								 
							
						 
						
							
							
								
								Include tags in v1 room initial sync  
							
							 
							
							
							
						 
						
							2015-10-30 16:28:19 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								fdf73c6855 
								
							
								 
							
						 
						
							
							
								
								Include room tags v1 /initialSync  
							
							 
							
							
							
						 
						
							2015-10-30 16:22:32 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								366af6b73a 
								
							
								 
							
						 
						
							
							
								
								Amalgamate _filter_events_for_client  
							
							 
							
							
							
						 
						
							2015-10-16 14:52:48 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								858634e1d0 
								
							
								 
							
						 
						
							
							
								
								Remove unused room_id arg  
							
							 
							
							
							
						 
						
							2015-10-14 09:31:20 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								dc72021748 
								
							
								 
							
						 
						
							
							
								
								Add a flag to initial sync to indicate we want rooms that the user has left  
							
							 
							
							
							
						 
						
							2015-10-08 17:26:23 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a14665bde7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/invite_state  
							
							 
							
							
							
						 
						
							2015-09-25 11:38:28 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								49c0a0b5c4 
								
							
								 
							
						 
						
							
							
								
								Clarify that room_initial_sync returns a python dict  
							
							 
							
							
							
						 
						
							2015-09-21 14:21:03 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								95c304e3f9 
								
							
								 
							
						 
						
							
							
								
								Fix doc string to point at the right class  
							
							 
							
							
							
						 
						
							2015-09-21 14:18:47 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								0c16285989 
								
							
								 
							
						 
						
							
							
								
								Add explicit "elif event.membership == Membership.LEAVE" for clarity  
							
							 
							
							
							
						 
						
							2015-09-21 14:17:16 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								1e101ed4a4 
								
							
								 
							
						 
						
							
							
								
								Clamp the "to" token for /rooms/{roomId}/messages to when the user left  
							
							 
							
							... 
							
							
							
							the room.
There isn't a way for the client to learn a valid "to" token for a room
that they have left in the C-S API but that doesn't stop a client making
one up. 
							
						 
						
							2015-09-21 14:13:10 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								e2054ce21a 
								
							
								 
							
						 
						
							
							
								
								Allow users to GET individual state events for rooms that they have left  
							
							 
							
							
							
						 
						
							2015-09-10 15:06:47 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								49ae42bbe1 
								
							
								 
							
						 
						
							
							
								
								Bundle in some room state in the unsigned bit of the invite when sending to invited servers  
							
							 
							
							
							
						 
						
							2015-09-10 14:25:54 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								09cb5c7d33 
								
							
								 
							
						 
						
							
							
								
								Allow users that have left a room to get the messages that happend in the room before they left  
							
							 
							
							
							
						 
						
							2015-09-09 17:31:09 +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
							
						 
						
							 
							
							
							
								
							
								1d579df664 
								
							
								 
							
						 
						
							
							
								
								Allow rooms/{roomId}/state for a room that has been left  
							
							 
							
							
							
						 
						
							2015-09-09 14:12:24 +01:00