8 Commits

Author	SHA1	Message	Date
David Baker	cb03fafdf1	Merge branch 'develop' into csauth	2015-04-17 13:51:10 +01:00
Paul "LeoNerd" Evans	04c7f3576e	Various minor fixes to unit-test structure around typing notifications	2015-04-15 23:32:11 +01:00
Paul "LeoNerd" Evans	0268d40281	Have TypingNotificationEventSource.get_new_events_for_user() return a deferred, for consistency and extensibility	2015-04-15 23:09:35 +01:00
David Baker	ce2766d19c	Fix tests	2015-03-24 18:56:51 +00:00
Mark Haines	896253e085	Factor out some of the common homeserver setup code into a ... setup_test_homeserver function in utils.	2015-02-11 11:37:30 +00:00
Mark Haines	388581e087	Extract the id token of the token when authing users, include the token and device_id in the internal meta data for the event along with the transaction id when sending events	2015-01-28 16:58:23 +00:00
Mark Haines	5759bec43c	Replace hs.parse_userid with UserID.from_string	2015-01-23 11:47:15 +00:00
Mark Haines	53584420a5	Move client rest tests back under rest	2015-01-22 16:13:27 +00:00