Mark Haines
							
						 | 
						
							
							
							
							
								
							
								acb68a39e0
								
							
								
							
						 | 
						
							
							
								
								Code style fixes.
							
							
							
							
							
						 | 
						
							2015-01-29 16:12:40 +00:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								5c6189ea3e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into pushers
							
							
							
							
							
							
							
							Conflicts:
	synapse/rest/__init__.py 
							
						 | 
						
							2015-01-22 17:46:16 +00:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								ede491b4e0
								
							
								
							
						 | 
						
							
							
								
								Oops: second part of commit dc938606
							
							
							
							
							
						 | 
						
							2015-01-22 17:38:53 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								97c68c508d
								
							
								
							
						 | 
						
							
							
								
								Move rest APIs back under the rest directory
							
							
							
							
							
						 | 
						
							2015-01-22 16:10:07 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								1d2016b4a8
								
							
								
							
						 | 
						
							
							
								
								Move client v1 api rest servlets into a "client/v1" directory
							
							
							
							
							
						 | 
						
							2015-01-22 14:59:08 +00:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								c06a9063e1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into pushers
							
							
							
							
							
						 | 
						
							2015-01-13 13:15:51 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								adb04b1e57
								
							
								
							
						 | 
						
							
							
								
								Update copyright notices
							
							
							
							
							
						 | 
						
							2015-01-06 13:21:39 +00:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								b56730bb6e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into pushers
							
							
							
							
							
							
							
							Conflicts:
	synapse/api/errors.py
	synapse/server.py
	synapse/storage/__init__.py 
							
						 | 
						
							2014-12-18 15:15:22 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								3c77d13aa5
								
							
								
							
						 | 
						
							
							
								
								Kill off synapse.api.events.*
							
							
							
							
							
						 | 
						
							2014-12-16 11:29:05 +00:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								74c3879760
								
							
								
							
						 | 
						
							
							
								
								Start creating a module to do generic notifications (just prints them to stdout currently!)
							
							
							
							
							
						 | 
						
							2014-11-19 18:20:59 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								3ccb17ce59
								
							
								
							
						 | 
						
							
							
								
								SYN-48: Implement WHOIS rest servlet
							
							
							
							
							
						 | 
						
							2014-09-29 14:59:52 +01:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								14ed6799d7
								
							
								
							
						 | 
						
							
							
								
								Add support for TURN servers as per the TURN REST API (http://tools.ietf.org/html/draft-uberti-behave-turn-rest-00)
							
							
							
							
							
						 | 
						
							2014-09-23 17:16:13 +01:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								8a7c1d6a00
								
							
								
							
						 | 
						
							
							
								
								fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.
							
							
							
							
							
						 | 
						
							2014-09-03 17:31:57 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								1d9d287c7c
								
							
								
							
						 | 
						
							
							
								
								Renamed /public/rooms to /publicRooms
							
							
							
							
							
						 | 
						
							2014-08-27 14:52:07 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								2e70de09b9
								
							
								
							
						 | 
						
							
							
								
								Renaming: /im/sync >> /initialSync. /rooms/$roomid/members/list >> /rooms/$roomid/members. /rooms$roomid/messages/list >> /room/$roomid/messages. Updated cmdclient, tests and webclient.
							
							
							
							
							
						 | 
						
							2014-08-26 16:19:17 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								29aa13f0d4
								
							
								
							
						 | 
						
							
							
								
								Make federation use resource_for_federation as well.
							
							
							
							
							
						 | 
						
							2014-08-14 10:05:06 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								9f863d3466
								
							
								
							
						 | 
						
							
							
								
								Start phasing out HttpServer: we should be using Resources instead. Added resource_for_client/federation/web_client to the HomeServer and hooked the C-S servlets to operate on resource_for_client. Dynamically construct the Resource tree.
							
							
							
							
							
						 | 
						
							2014-08-14 09:55:16 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								7f40fa1d46
								
							
								
							
						 | 
						
							
							
								
								Added a -w flag which will host the web client if specified. Currently this just delegates to the webclient RestServlet.
							
							
							
							
							
						 | 
						
							2014-08-13 13:50:01 +01:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								f98e6380f1
								
							
								
							
						 | 
						
							
							
								
								add in whitespace after copyright statements to improve legibility
							
							
							
							
							
						 | 
						
							2014-08-13 03:14:34 +01:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								514df1f648
								
							
								
							
						 | 
						
							
							
								
								actually register the login servlet (uncommitted code thinko?)
							
							
							
							
							
						 | 
						
							2014-08-13 02:33:04 +01:00 | 
						
					
				
					
						
							
							
								 
								matrix.org
							
						 | 
						
							
							
							
							
								
							
								4f475c7697
								
							
								
							
						 | 
						
							
							
								
								Reference Matrix Home Server
							
							
							
							
							
						 | 
						
							2014-08-12 15:10:52 +01:00 |