Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							42529cbced 
							
						 
					 
					
						
						
							
							Fix pyflakes errors  
						
						
						
						
							
						
					 
					
						2015-01-19 15:33:04 +00:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							00e9c08609 
							
						 
					 
					
						
						
							
							Fix syntax  
						
						
						
						
							
						
					 
					
						2015-01-19 15:30:48 +00:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							3e85e52b3f 
							
						 
					 
					
						
						
							
							Allow ':memory:' as the database path for sqlite3  
						
						
						
						
							
						
					 
					
						2015-01-19 15:26:19 +00:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							5fed042640 
							
						 
					 
					
						
						
							
							Finish renaming "context" to "room_id" in federation codebase  
						
						
						
						
							
						
					 
					
						2015-01-16 19:01:03 +00:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							2408c4b0a4 
							
						 
					 
					
						
						
							
							Fold _do_request_for_transaction into the methods that called it since it was a trivial wrapper around client.get_json  
						
						
						
						
							
						
					 
					
						2015-01-16 19:01:03 +00:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							602684eac5 
							
						 
					 
					
						
						
							
							Split transport layer into client and server parts  
						
						
						
						
							
						
					 
					
						2015-01-16 19:01:03 +00:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							2bdee98269 
							
						 
					 
					
						
						
							
							Remove temporary debug logging that was accidentally committed  
						
						
						
						
							
						
					 
					
						2015-01-16 19:00:40 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							2d2953cf5f 
							
						 
					 
					
						
						
							
							Require device language when adding a pusher.  
						
						... 
						
						
						
						Because this seems like it might be useful to do sooner rather
than later. 
						
						
							
						
					 
					
						2015-01-16 11:24:10 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							2ca2dbc821 
							
						 
					 
					
						
						
							
							Send room name and first alias in notification poke.  
						
						
						
						
							
						
					 
					
						2015-01-15 16:56:18 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							e3e2fc3255 
							
						 
					 
					
						
						
							
							Don't make the pushers' event streams cause people to appear online  
						
						
						
						
							
						
					 
					
						2015-01-15 16:17:21 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							2cb30767fa 
							
						 
					 
					
						
						
							
							Honour the 'rejected' return from push gateways  
						
						... 
						
						
						
						Add a timestamp to push tokens so we know the last time they we
got them from the device. Send it to the push gateways so it can
determine whether its failure is more recent than the token.
Stop and remove pushers that have been rejected. 
						
						
							
						
					 
					
						2015-01-13 19:48:37 +00:00 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							34a5fbe2b7 
							
						 
					 
					
						
						
							
							Have /join/:room_id return the room ID in response anyway, for consistency of clients (SYN-234)  
						
						
						
						
							
						
					 
					
						2015-01-13 17:29:24 +00:00 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							cf7e723808 
							
						 
					 
					
						
						
							
							Have MockClock detect attempts to cancel expired timers, to prevent a repeat of SYN-230  
						
						
						
						
							
						
					 
					
						2015-01-13 16:58:36 +00:00 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							c2e7c84e58 
							
						 
					 
					
						
						
							
							Don't try to cancel already-expired timers - SYN-230  
						
						
						
						
							
						
					 
					
						2015-01-13 16:58:36 +00:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							3891597eb3 
							
						 
					 
					
						
						
							
							Remove unused functions  
						
						
						
						
							
						
					 
					
						2015-01-13 15:57:26 +00:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							fda63064fc 
							
						 
					 
					
						
						
							
							get_room_events isn't called anywhere  
						
						
						
						
							
						
					 
					
						2015-01-13 14:43:26 +00:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							895fcb377e 
							
						 
					 
					
						
						
							
							Fix stream token ordering  
						
						
						
						
							
						
					 
					
						2015-01-13 14:38:53 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							c06a9063e1 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into pushers  
						
						
						
						
							
						
					 
					
						2015-01-13 13:15:51 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							70d0a453f3 
							
						 
					 
					
						
						
							
							Split out function to decide whether to notify or a given event  
						
						
						
						
							
						
					 
					
						2015-01-13 13:14:41 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							38e3241eb7 
							
						 
					 
					
						
						
							
							Merge branch 'hotfixes-v0.6.1b' of github.com:matrix-org/synapse into develop  
						
						
						
						
							
						
					 
					
						2015-01-13 10:01:22 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							b1a38c39ad 
							
						 
					 
					
						
						
							
							Merge branch 'hotfixes-v0.6.1b' of github.com:matrix-org/synapse  
						
						
						
						
							
 
						
					 
					
						2015-01-13 10:00:47 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							1d3d37937d 
							
						 
					 
					
						
						
							
							Bump version  
						
						
						
						
							
						
					 
					
						2015-01-13 09:59:47 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							39585bf556 
							
						 
					 
					
						
						
							
							Insert 'age' into top level when returning events to clients  
						
						
						
						
							
						
					 
					
						2015-01-13 09:57:32 +00:00 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							02ffbb20d0 
							
						 
					 
					
						
						
							
							Use float rather than integer divisions to turn msec into sec - so timeouts under 1000msec will actually work  
						
						
						
						
							
						
					 
					
						2015-01-12 19:09:14 +00:00 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							9c804bc3fd 
							
						 
					 
					
						
						
							
							Check that setting typing notification still works after explicit timeout at REST layer - SYN-230  
						
						
						
						
							
						
					 
					
						2015-01-12 18:31:48 +00:00 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							67d8305aea 
							
						 
					 
					
						
						
							
							Make typing notification timeouts print a (debug) logging message  
						
						
						
						
							
						
					 
					
						2015-01-12 18:22:00 +00:00 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							db72a07ef5 
							
						 
					 
					
						
						
							
							Don't make @unittest.DEBUG print the huge amount of verbosity generated by the synapse.storage loggers  
						
						
						
						
							
						
					 
					
						2015-01-12 18:16:27 +00:00 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							968dc988f9 
							
						 
					 
					
						
						
							
							Check that setting typing notification still works after explicit timeout - SYN-230  
						
						
						
						
							
						
					 
					
						2015-01-12 18:01:49 +00:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							c43d898119 
							
						 
					 
					
						
						
							
							SYN-178: Fix off by one.  
						
						
						
						
							
						
					 
					
						2015-01-12 17:38:40 +00:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							d8fcc4e00a 
							
						 
					 
					
						
						
							
							Add copyrighter script for sql  
						
						
						
						
							
						
					 
					
						2015-01-12 14:31:05 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							bfb198a6eb 
							
						 
					 
					
						
						
							
							don't clobber pythonpath  
						
						
						
						
							
						
					 
					
						2015-01-09 18:14:05 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							28db5dde4c 
							
						 
					 
					
						
						
							
							oops  
						
						
						
						
							
						
					 
					
						2015-01-08 20:38:55 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							80e89772e2 
							
						 
					 
					
						
						
							
							spell out that local libs may need to be explicitly given priority  
						
						
						
						
							
						
					 
					
						2015-01-08 20:37:08 +00:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							63403aa7a5 
							
						 
					 
					
						
						
							
							Check the existance and versions of necessary modules when starting synapse, log which modules are used  
						
						
						
						
							
						
					 
					
						2015-01-08 17:08:57 +00:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							9d0dcf2e3c 
							
						 
					 
					
						
						
							
							SYN-142: Rotate logs if logging to file. Fixed to a 4 file rotate with 100MB/file for now.  
						
						
						
						
							
						
					 
					
						2015-01-08 15:31:29 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							7f83613733 
							
						 
					 
					
						
						
							
							make our JPEG thumbnail quality less horrifically ugly  
						
						
						
						
							
						
					 
					
						2015-01-08 15:11:22 +00:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							b5924cae04 
							
						 
					 
					
						
						
							
							Add raw query param for scrollback.  
						
						
						
						
							
						
					 
					
						2015-01-08 14:37:55 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							379a653ae3 
							
						 
					 
					
						
						
							
							Add better help message for --server-name config option.  
						
						
						
						
							
						
					 
					
						2015-01-08 14:32:53 +00:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							edb557b2ad 
							
						 
					 
					
						
						
							
							Return the raw federation event rather than adding extra keys for federation data.  
						
						
						
						
							
						
					 
					
						2015-01-08 14:28:08 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							5940ec993b 
							
						 
					 
					
						
						
							
							Add missing continuation indent.  
						
						
						
						
							
						
					 
					
						2015-01-08 13:59:29 +00:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							5720ab59e0 
							
						 
					 
					
						
						
							
							Add 'raw' query parameter to expose the event graph and signatures to savvy clients.  
						
						
						
						
							
						
					 
					
						2015-01-08 13:57:40 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							d44dd47fbf 
							
						 
					 
					
						
						
							
							Add optional limit to graph script  
						
						
						
						
							
						
					 
					
						2015-01-08 10:53:03 +00:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							8ac9199f56 
							
						 
					 
					
						
						
							
							Merge branch 'master' into develop  
						
						
						
						
							
						
					 
					
						2015-01-08 09:43:48 +00:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							f3467d4646 
							
						 
					 
					
						
						
							
							Merge branch 'hotfixes-v0.6.1'  
						
						
						
						
							
 
						
					 
					
						2015-01-08 09:43:01 +00:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							5a0e687d5c 
							
						 
					 
					
						
						
							
							Bump version  
						
						
						
						
							
						
					 
					
						2015-01-08 09:42:23 +00:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							c9d2cecac9 
							
						 
					 
					
						
						
							
							SYN-231: User agent header broken  
						
						
						
						
							
						
					 
					
						2015-01-08 09:41:11 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							42507b0011 
							
						 
					 
					
						
						
							
							Log server version on startup  
						
						
						
						
							
						
					 
					
						2015-01-07 17:25:28 +00:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							76e1565200 
							
						 
					 
					
						
						
							
							Change error message for missing pillow libs.  
						
						
						
						
							
						
					 
					
						2015-01-07 17:11:19 +00:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							333836ff92 
							
						 
					 
					
						
						
							
							PEP8 and pyflakes warnings  
						
						
						
						
							
						
					 
					
						2015-01-07 16:18:12 +00:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							a09882de83 
							
						 
					 
					
						
						
							
							Update tests  
						
						
						
						
							
						
					 
					
						2015-01-07 16:12:14 +00:00