Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								6c28ac260c
								
							
								
							
						 | 
						
							
							
								
								copyrights
							
							
							
							
							
						 | 
						
							2016-01-07 04:26:29 +00:00 | 
						
					
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 | 
						
							
							
							
							
								
							
								7a8ba4c9a0
								
							
								
							
						 | 
						
							
							
								
								Actually host r0 and unstable prefixes
							
							
							
							
							
						 | 
						
							2015-12-08 15:26:52 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								a7b65bdedf
								
							
								
							
						 | 
						
							
							
								
								Add config option to turn off freezing events. Use new encode_json api and ujson.loads
							
							
							
							
							
						 | 
						
							2015-05-29 12:17:33 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								24cc6979fb
								
							
								
							
						 | 
						
							
							
								
								Log when we receive a request, when we send a response and how long it took to process it.
							
							
							
							
							
						 | 
						
							2015-02-09 13:46:22 +00:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								4fbf2328c2
								
							
								
							
						 | 
						
							
							
								
								Unnecessary new line
							
							
							
							
							
						 | 
						
							2015-01-28 14:24:28 +00:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								c291a4d522
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into pushers
							
							
							
							
							
							
							
							Conflicts:
	synapse/handlers/events.py
	synapse/server.py 
							
						 | 
						
							2015-01-28 12:51:05 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								7256def8e4
								
							
								
							
						 | 
						
							
							
								
								Merge rest servlets into the client json resource object
							
							
							
							
							
						 | 
						
							2015-01-23 10:37:38 +00:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								5c6189ea3e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into pushers
							
							
							
							
							
							
							
							Conflicts:
	synapse/rest/__init__.py 
							
						 | 
						
							2015-01-22 17:46:16 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								97c68c508d
								
							
								
							
						 | 
						
							
							
								
								Move rest APIs back under the rest directory
							
							
							
							
							
						 | 
						
							2015-01-22 16:10:07 +00:00 |