Erik Johnston
							
						 
						
							 
							
							
							
								
							
								7ed2bbeb11 
								
							
								 
							
						 
						
							
							
								
								Clean up a bit. Add comment  
							
							 
							
							
							
						 
						
							2016-01-28 14:32:05 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								9101193242 
								
							
								 
							
						 
						
							
							
								
								Quot all the things  
							
							 
							
							
							
						 
						
							2016-01-28 14:18:45 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								571a566399 
								
							
								 
							
						 
						
							
							
								
								Change load limit params  
							
							 
							
							
							
						 
						
							2016-01-28 14:11:16 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3c6518ddbf 
								
							
								 
							
						 
						
							
							
								
								Amalgamate incremental and full sync for user  
							
							 
							
							
							
						 
						
							2016-01-28 14:03:48 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4e7948b47a 
								
							
								 
							
						 
						
							
							
								
								Allow paginating backwards from stream token  
							
							 
							
							
							
						 
						
							2016-01-28 11:52:34 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ba8931829b 
								
							
								 
							
						 
						
							
							
								
								Return correct type of token  
							
							 
							
							
							
						 
						
							2016-01-28 11:34:17 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								61eaa6ec64 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync  
							
							 
							
							
							
						 
						
							2016-01-28 10:50:57 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c5e7c0e436 
								
							
								 
							
						 
						
							
							
								
								Up get_rooms_for_user cache size  
							
							 
							
							
							
						 
						
							2016-01-28 09:58:45 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								e26390ca46 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #535  from matrix-org/rav/paginate_from_stream_token  
							
							 
							
							... 
							
							
							
							Make it possible to paginate forwards from stream tokens 
							
						 
						
							2016-01-28 09:49:46 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a6477d5933 
								
							
								 
							
						 
						
							
							
								
								Remove chdir  
							
							 
							
							
							
						 
						
							2016-01-28 09:19:55 +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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5fc9b17518 
								
							
								 
							
						 
						
							
							
								
								No chdir  
							
							 
							
							
							
						 
						
							2016-01-27 17:39:20 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								fa90c180ee 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/setup  
							
							 
							
							
							
						 
						
							2016-01-27 17:37:33 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5610880003 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #530  from matrix-org/erikj/server_refactor  
							
							 
							
							... 
							
							
							
							Remove redundant BaseHomeServer 
							
						 
						
							2016-01-27 17:36:31 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e7febf4fbb 
								
							
								 
							
						 
						
							
							
								
								PEP8  
							
							 
							
							
							
						 
						
							2016-01-27 17:33:27 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								aca3193efb 
								
							
								 
							
						 
						
							
							
								
								Use the same path for incremental with gap or without gap  
							
							 
							
							
							
						 
						
							2016-01-27 17:33:27 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b97f6626b6 
								
							
								 
							
						 
						
							
							
								
								Add cache to room stream  
							
							 
							
							
							
						 
						
							2016-01-27 17:33:26 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								f93ecf8783 
								
							
								 
							
						 
						
							
							
								
								Don't turn on profiling  
							
							 
							
							
							
						 
						
							2016-01-27 17:33:26 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0487c9441f 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							2016-01-27 17:33:13 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a955cbfa49 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/setup  
							
							 
							
							
							
						 
						
							2016-01-27 17:22:35 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								8c97b49886 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #533  from matrix-org/rav/hashtest_federation  
							
							 
							
							... 
							
							
							
							Fix federation for #test:matrix.org 
							
						 
						
							2016-01-27 17:19:36 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2152b320c5 
								
							
								 
							
						 
						
							
							
								
								PEP 8  
							
							 
							
							
							
						 
						
							2016-01-27 17:09:17 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								d6d60b4d6c 
								
							
								 
							
						 
						
							
							
								
								Federation: drop events which cause SynapseErrors  
							
							 
							
							... 
							
							
							
							... rather than rejecting any attempt to federate channels which contain such
events. 
							
						 
						
							2016-01-27 17:02:10 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								d6c831bd3d 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #531  from matrix-org/markjh/relative_push_rules  
							
							 
							
							... 
							
							
							
							Fix adding push rules relative to other rules 
							
						 
						
							2016-01-27 17:13:36 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								8c94833b72 
								
							
								 
							
						 
						
							
							
								
								Fix adding push rules relative to other rules  
							
							 
							
							
							
						 
						
							2016-01-27 10:24:20 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9fda8b5193 
								
							
								 
							
						 
						
							
							
								
								Don't turn on profiling  
							
							 
							
							
							
						 
						
							2016-01-26 18:27:23 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e4e33c743e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/server_refactor  
							
							 
							
							
							
						 
						
							2016-01-26 17:30:00 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								87f9477b10 
								
							
								 
							
						 
						
							
							
								
								Add a Homeserver.setup method.  
							
							 
							
							... 
							
							
							
							This is for setting up dependencies that require work on startup. This
is useful for the DataStore that wants to read a bunch from the database
before initiliazing. 
							
						 
						
							2016-01-26 15:51:06 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9959d9ece8 
								
							
								 
							
						 
						
							
							
								
								Remove redundated BaseHomeServer  
							
							 
							
							
							
						 
						
							2016-01-26 13:52:29 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								27b9775073 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #529  from matrix-org/dbkr/one_to_one_only_messages  
							
							 
							
							... 
							
							
							
							Only notify for messages in one to one rooms, not every event 
							
						 
						
							2016-01-26 11:50:26 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								766c24b2e6 
								
							
								 
							
						 
						
							
							
								
								Only notify for messages in one to one rooms, not every event  
							
							 
							
							... 
							
							
							
							Fixes the fact that candidate events and hangups generated notifications. 
							
						 
						
							2016-01-26 10:21:41 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								7179fdd550 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #528  from matrix-org/markjh/missing_yield  
							
							 
							
							... 
							
							
							
							Add missing yield in push_rules set enabled 
							
						 
						
							2016-01-25 21:26:30 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c887c4cbd5 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #524  from matrix-org/erikj/sync  
							
							 
							
							... 
							
							
							
							Move some sync logic from rest to handlers pacakege 
							
						 
						
							2016-01-25 16:58:39 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								e18257f0e5 
								
							
								 
							
						 
						
							
							
								
								Add missing yield in push_rules set enabled  
							
							 
							
							
							
						 
						
							2016-01-25 16:51:56 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8431f62ebb 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #525  from matrix-org/erikj/select_many  
							
							 
							
							... 
							
							
							
							Implement a `_simple_select_many_batch` 
							
						 
						
							2016-01-25 16:30:36 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								f091b73e69 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #527  from matrix-org/erikj/push_cache  
							
							 
							
							... 
							
							
							
							Push: Use storage apis that are cached 
							
						 
						
							2016-01-25 16:16:34 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ce6fbbea94 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #526  from matrix-org/erikj/push_index  
							
							 
							
							... 
							
							
							
							Add index to event_push_actions 
							
						 
						
							2016-01-25 16:06:07 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								aea5da0ef6 
								
							
								 
							
						 
						
							
							
								
								Guard against empty iterables  
							
							 
							
							
							
						 
						
							2016-01-25 15:59:29 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3a75159832 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #521  from matrix-org/erikj/underscores  
							
							 
							
							... 
							
							
							
							Underscores are allowed in user ids 
							
						 
						
							2016-01-25 15:56:31 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								1ebf5e3d03 
								
							
								 
							
						 
						
							
							
								
								Correct docstring  
							
							 
							
							
							
						 
						
							2016-01-25 15:53:36 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								dc2647cd3d 
								
							
								 
							
						 
						
							
							
								
								PEP8  
							
							 
							
							
							
						 
						
							2016-01-25 15:48:54 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								86896408b0 
								
							
								 
							
						 
						
							
							
								
								Add index to event_push_actions  
							
							 
							
							
							
						 
						
							2016-01-25 15:30:32 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								53cb173663 
								
							
								 
							
						 
						
							
							
								
								Push: Use storage apis that are cached  
							
							 
							
							
							
						 
						
							2016-01-25 13:55:18 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d59c58bc95 
								
							
								 
							
						 
						
							
							
								
								Remove weird stuff  
							
							 
							
							
							
						 
						
							2016-01-25 13:38:53 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ddd25def01 
								
							
								 
							
						 
						
							
							
								
								Implement a _simple_select_many_batch  
							
							 
							
							
							
						 
						
							2016-01-25 13:36:02 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8c6012a4af 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							2016-01-25 13:12:35 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								42deca50c2 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync  
							
							 
							
							
							
						 
						
							2016-01-25 12:49:45 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d685ae73b4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'erikj/filters' of github.com:matrix-org/synapse into develop  
							
							 
							
							
							
						 
						
							2016-01-25 12:35:25 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4021f95261 
								
							
								 
							
						 
						
							
							
								
								Move logic from rest/ to handlers/  
							
							 
							
							
							
						 
						
							2016-01-25 10:10:44 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								f92fe15897 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #523  from matrix-org/dbkr/no_push_unless_notify  
							
							 
							
							... 
							
							
							
							Better fix for actions with both dont_notify and tweaks 
							
						 
						
							2016-01-22 17:27:25 +00:00