Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								21fd84dcb8 
								
							
								 
							
						 
						
							
							
								
								Use seconds; start gluing in the AS scheduler into the AS handler.  
							
							 
							
							
							
						 
						
							2015-03-09 17:01:19 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9ccccd4874 
								
							
								 
							
						 
						
							
							
								
								When setting display name more graciously handle failures to update room state.  
							
							 
							
							
							
						 
						
							2015-03-06 16:24:05 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								130df8fb01 
								
							
								 
							
						 
						
							
							
								
								Add some randomness to the user specified timeout on event streams to mitigate against thundering herds problems  
							
							 
							
							
							
						 
						
							2015-03-06 10:25:36 +00:00  
						
					 
				
					
						
							
							
								 
								Kegsay
							
						 
						
							 
							
							
							
								
							
								8ad024ea80 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #93  from matrix-org/application-services-exclusive  
							
							 
							
							... 
							
							
							
							Application services exclusive flag support 
							
						 
						
							2015-03-02 14:56:32 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0a036944bd 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pdu  
							
							 
							
							
							
						 
						
							2015-03-02 13:53:30 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								58ff066064 
								
							
								 
							
						 
						
							
							
								
								Implement exclusive namespace checks.  
							
							 
							
							
							
						 
						
							2015-02-27 13:51:41 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								dcec7175dc 
								
							
								 
							
						 
						
							
							
								
								Finish impl to get new events for AS. ASes should now be able to poll /events  
							
							 
							
							
							
						 
						
							2015-02-26 16:23:01 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								2d20466f9a 
								
							
								 
							
						 
						
							
							
								
								Add stub functions and work out execution flow to implement AS event stream polling.  
							
							 
							
							
							
						 
						
							2015-02-25 15:00:59 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								443ba4eecc 
								
							
								 
							
						 
						
							
							
								
								%s for strings otherwise you end up sending 'u"foo"'  
							
							 
							
							
							
						 
						
							2015-02-24 15:00:12 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e25e0f4da9 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pdu  
							
							 
							
							
							
						 
						
							2015-02-23 14:36:00 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								db215b7e00 
								
							
								 
							
						 
						
							
							
								
								Implement and use new batched get missing pdu  
							
							 
							
							
							
						 
						
							2015-02-23 13:58:02 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2bafeca270 
								
							
								 
							
						 
						
							
							
								
								Add missing comma so that it generates a dict and not a set  
							
							 
							
							
							
						 
						
							2015-02-20 14:08:42 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0ac2a79faa 
								
							
								 
							
						 
						
							
							
								
								Initial stab at implementing a batched get_missing_pdus request  
							
							 
							
							
							
						 
						
							2015-02-19 17:24:14 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								fa6c93bd26 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'consumeErrors' of github.com:matrix-org/synapse into develop  
							
							 
							
							
							
						 
						
							2015-02-17 15:18:17 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								47281f8fa4 
								
							
								 
							
						 
						
							
							
								
								Change some debug logging to info  
							
							 
							
							
							
						 
						
							2015-02-17 13:14:11 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c2b1dbd84c 
								
							
								 
							
						 
						
							
							
								
								We do want to consumeError  
							
							 
							
							
							
						 
						
							2015-02-17 11:11:11 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								72a4de2ce6 
								
							
								 
							
						 
						
							
							
								
								Use consumeErrors=True on all DeferredLists.  
							
							 
							
							... 
							
							
							
							This is so that the DeferredLists actually consume the error instead of
propogating down the non-existent errback chain. This should reduce the
number of unhandled errors we are seeing. 
							
						 
						
							2015-02-17 10:07:01 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8a59915d7d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'hotfixes-v0.7.0f' of github.com:matrix-org/synapse into develop  
							
							 
							
							
							
						 
						
							2015-02-16 09:47:22 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b99a33f283 
								
							
								 
							
						 
						
							
							
								
								resolve_events expect lists, not dicts  
							
							 
							
							
							
						 
						
							2015-02-15 20:20:51 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								650dc7f0f9 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of github.com:matrix-org/synapse into develop  
							
							 
							
							
							
						 
						
							2015-02-13 15:46:42 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b11a6e1c3c 
								
							
								 
							
						 
						
							
							
								
								Fix wrong variable name  
							
							 
							
							
							
						 
						
							2015-02-13 15:37:18 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								0d872f5aa6 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #50  from matrix-org/application-services  
							
							 
							
							... 
							
							
							
							Application Services 
							
						 
						
							2015-02-13 15:06:14 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e441c10a73 
								
							
								 
							
						 
						
							
							
								
								pyflakes  
							
							 
							
							
							
						 
						
							2015-02-13 14:23:39 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8c652a2b5f 
								
							
								 
							
						 
						
							
							
								
								When we see a difference in current state, actually use state conflict resolution algorithm  
							
							 
							
							
							
						 
						
							2015-02-13 14:20:05 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								93d07c87dc 
								
							
								 
							
						 
						
							
							
								
								Reindent code to be less human-readable to keep pep8 from complaining  
							
							 
							
							
							
						 
						
							2015-02-12 19:19:37 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								5f6e6530d0 
								
							
								 
							
						 
						
							
							
								
								Appease pyflakes  
							
							 
							
							
							
						 
						
							2015-02-12 19:15:23 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								29805213d1 
								
							
								 
							
						 
						
							
							
								
								Can now remove the FIXME too  
							
							 
							
							
							
						 
						
							2015-02-12 19:13:21 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								860b1b4841 
								
							
								 
							
						 
						
							
							
								
								Only attempt to fetch presence state of JOINed members in room initialSync (SYN-202)  
							
							 
							
							
							
						 
						
							2015-02-12 19:13:21 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								76935078d1 
								
							
								 
							
						 
						
							
							
								
								Remove more debug logging  
							
							 
							
							
							
						 
						
							2015-02-11 16:51:22 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ed877d6585 
								
							
								 
							
						 
						
							
							
								
								Remove debug logging  
							
							 
							
							
							
						 
						
							2015-02-11 16:50:46 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ddb816cf60 
								
							
								 
							
						 
						
							
							
								
								Don't unfreeze when using FreezeEvent.get_dict, as we are using a JSONEncoder that understands FrozenDict  
							
							 
							
							
							
						 
						
							2015-02-11 15:44:28 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								fd40d992ad 
								
							
								 
							
						 
						
							
							
								
								PEP8-ify  
							
							 
							
							
							
						 
						
							2015-02-11 10:41:33 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								c7783d6fee 
								
							
								 
							
						 
						
							
							
								
								Notify ASes for events sent by other users in a room which an AS user is a part of.  
							
							 
							
							
							
						 
						
							2015-02-11 10:36:08 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								9978c5c103 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into application-services  
							
							 
							
							
							
						 
						
							2015-02-11 10:03:24 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								84a769cdb7 
								
							
								 
							
						 
						
							
							
								
								Fix code-style  
							
							 
							
							
							
						 
						
							2015-02-10 17:58:36 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								b085fac735 
								
							
								 
							
						 
						
							
							
								
								Code-style fixes  
							
							 
							
							
							
						 
						
							2015-02-10 16:30:48 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b90d377af4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'release-v0.6.2' of github.com:matrix-org/synapse into develop  
							
							 
							
							
							
						 
						
							2015-02-10 10:33:35 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d94f682a4c 
								
							
								 
							
						 
						
							
							
								
								During room intial sync, only calculate current state once.  
							
							 
							
							
							
						 
						
							2015-02-09 17:41:29 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								53557fc532 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into application-services  
							
							 
							
							
							
						 
						
							2015-02-09 15:20:56 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								f7cac2f7b6 
								
							
								 
							
						 
						
							
							
								
								Fix bugs so lazy room joining works as intended.  
							
							 
							
							
							
						 
						
							2015-02-09 15:01:28 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								ac3183caaa 
								
							
								 
							
						 
						
							
							
								
								Register a user account for the AS when the AS registers. Add 'sender' column to AS table.  
							
							 
							
							
							
						 
						
							2015-02-09 12:03:37 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								37b6b880ef 
								
							
								 
							
						 
						
							
							
								
								don't give up if we can't create default avatars during tests  
							
							 
							
							
							
						 
						
							2015-02-07 21:24:08 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								582019f870 
								
							
								 
							
						 
						
							
							
								
								...and here's the actual impl. git fail.  
							
							 
							
							
							
						 
						
							2015-02-07 13:32:14 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								73a680b2a8 
								
							
								 
							
						 
						
							
							
								
								Add errcodes for appservice registrations.  
							
							 
							
							
							
						 
						
							2015-02-06 17:10:04 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								20db147ef3 
								
							
								 
							
						 
						
							
							
								
								SYN-258: get_recent_events_for_room only accepts stream tokens, convert the topological token to a stream token before passing it to get_recent_events_for_room  
							
							 
							
							
							
						 
						
							2015-02-06 16:01:04 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								55a186485c 
								
							
								 
							
						 
						
							
							
								
								SYN-258: get_recent_events_for_room only accepts stream tokens, convert the topological token to a stream token before passing it to get_recent_events_for_room  
							
							 
							
							
							
						 
						
							2015-02-06 15:58:40 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								cc0532a4bf 
								
							
								 
							
						 
						
							
							
								
								Explicitly list the RejectedReasons that we can prove  
							
							 
							
							
							
						 
						
							2015-02-06 15:16:26 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e890ce223c 
								
							
								 
							
						 
						
							
							
								
								Don't query auth if the only difference is events that were rejected due to auth.  
							
							 
							
							
							
						 
						
							2015-02-06 14:16:50 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c78b5fb1f1 
								
							
								 
							
						 
						
							
							
								
								Make seen_ids a set  
							
							 
							
							
							
						 
						
							2015-02-06 13:52:16 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								0995810273 
								
							
								 
							
						 
						
							
							
								
								Pyflakes: unused variable.  
							
							 
							
							
							
						 
						
							2015-02-06 11:45:19 +00:00