57 Commits

Author	SHA1	Message	Date
Erik Johnston	2f91d16033	We don't need to do a json.loads here	2014-08-18 11:00:22 +01:00
Erik Johnston	40c020ad13	Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor	2014-08-15 16:48:16 +01:00
Paul "LeoNerd" Evans	ec1fd20e59	Also include users' presence when responding to /rooms/:room_id/members/list	2014-08-15 16:47:50 +01:00
Erik Johnston	661c711765	Start fixing places that use the data store.	2014-08-14 17:34:37 +01:00
Paul "LeoNerd" Evans	7fb93f2a47	Add a HomeServer.parse_roomalias() to avoid having to RoomAlias.from_sring(..., hs=hs) - similar to parse_userid()	2014-08-13 18:03:41 +01:00
Matthew Hodgson	f98e6380f1	add in whitespace after copyright statements to improve legibility	2014-08-13 03:14:34 +01:00
matrix.org	4f475c7697	Reference Matrix Home Server	2014-08-12 15:10:52 +01:00