12762 Commits

Author	SHA1	Message	Date
Kegan Dougal	38c7e92331	Merge branch 'master' of github.com:matrix-org/synapse	2014-08-13 15:53:44 +01:00
Paul "LeoNerd" Evans	b370f9903c	Fix logging verbosity parsing code	2014-08-13 15:14:22 +01:00
Paul "LeoNerd" Evans	820ed34abe	Namespace all the Federation HTTP URLs to /matrix/federation/v1/...	2014-08-13 15:07:55 +01:00
Paul "LeoNerd" Evans	55944ccf72	Use strings instead of opaque magic-number constants for presence states; rename AWAY to UNAVAILABLE	2014-08-13 14:31:48 +01:00
Kegan Dougal	5a59da8a94	Merge branch 'master' of github.com:matrix-org/synapse	2014-08-13 13:50:05 +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	2a0f7541c7	verbose by default please	2014-08-13 12:06:58 +01:00
Kegan Dougal	9b3702c924	Return the room_alias when GETing public rooms.	2014-08-13 11:57:49 +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
Erik Johnston	4add1c70e9	Just say yes to OPTIONS requests, since we want to turn on CORS headers for all paths	2014-08-12 17:17:14 +01:00
matrix.org	4f475c7697	Reference Matrix Home Server	2014-08-12 15:10:52 +01:00