Mark Haines
							
						 | 
						
							
							
							
							
								
							
								7ceda8bf3d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'client_v2_filter' into client_v2_sync
							
							
							
							
							
						 | 
						
							2015-01-29 18:04:07 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								93ed31dda2
								
							
								
							
						 | 
						
							
							
								
								Create a separate filter object to do the actual filtering, so that we can
							
							
							
							
							
							
							
							split the storage and management of filters from the actual filter code
and don't have to load a filter from the db each time we filter an event 
							
						 | 
						
							2015-01-29 17:45:07 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								722b65f461
								
							
								
							
						 | 
						
							
							
								
								Move typing notifs to an "emphermal" event list on the room object
							
							
							
							
							
						 | 
						
							2015-01-29 16:41:21 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								cf7c54ec93
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'client_v2_filter' into client_v2_sync
							
							
							
							
							
						 | 
						
							2015-01-29 15:55:58 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								33391db5f8
								
							
								
							
						 | 
						
							
							
								
								Merge in auth changes from develop
							
							
							
							
							
						 | 
						
							2015-01-29 15:54:54 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								396a67a09a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'client_v2_filter' into client_v2_sync
							
							
							
							
							
							
							
							Conflicts:
	synapse/rest/client/v2_alpha/__init__.py 
							
						 | 
						
							2015-01-29 14:58:00 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								3dbce6f4a5
								
							
								
							
						 | 
						
							
							
								
								Add typing notifications to sync
							
							
							
							
							
						 | 
						
							2015-01-29 03:33:51 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								b9c442c85c
								
							
								
							
						 | 
						
							
							
								
								Include transaction ids in unsigned section of events in the sync results for the clients that made those requests
							
							
							
							
							
						 | 
						
							2015-01-29 02:46:00 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								c81a19552f
								
							
								
							
						 | 
						
							
							
								
								Add ports back to demo/start.sh
							
							
							
							
							
						 | 
						
							2015-01-28 17:32:49 +00:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								c23e3db544
								
							
								
							
						 | 
						
							
							
								
								Add filter JSON sanity checks.
							
							
							
							
							
						 | 
						
							2015-01-28 16:45:18 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								e020574d65
								
							
								
							
						 | 
						
							
							
								
								Fix Formatting
							
							
							
							
							
						 | 
						
							2015-01-27 20:19:36 +00:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								059651efa1
								
							
								
							
						 | 
						
							
							
								
								Have the Filtering API return Deferreds, so we can do the Datastore implementation nicely
							
							
							
							
							
						 | 
						
							2015-01-27 16:17:56 +00:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								05c7cba73a
								
							
								
							
						 | 
						
							
							
								
								Initial trivial implementation of an actual 'Filtering' object; move storage of user filters into there
							
							
							
							
							
						 | 
						
							2015-01-27 14:28:56 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								436513068d
								
							
								
							
						 | 
						
							
							
								
								Start implementing the non-incremental sync portion of the v2 /sync API
							
							
							
							
							
						 | 
						
							2015-01-26 18:53:31 +00:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								8d7accb28f
								
							
								
							
						 | 
						
							
							
								
								Initial minimal attempt at /user/:user_id/filter API - in-memory storage, no actual filter implementation
							
							
							
							
							
						 | 
						
							2015-01-26 14:33:30 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								7b814d3f7f
								
							
								
							
						 | 
						
							
							
								
								Add client v2_alpha resource to synapse server resource tree
							
							
							
							
							
						 | 
						
							2015-01-23 18:55:19 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								e26340cee7
								
							
								
							
						 | 
						
							
							
								
								Start implementing the v2_alpha sync API
							
							
							
							
							
						 | 
						
							2015-01-23 18:48:17 +00:00 |