165 commits

Author	SHA1	Message	Date
Mark Haines	9d8f798a3f	Merge changes from develop	2015-01-29 14:55:27 +00:00
Mark Haines	26c8fff19e	Merge pull request #36 from matrix-org/device_id_from_access_token ... Extract the device id and token id from the access token when autheniticating users	2015-01-28 17:19:28 +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	c59bcabf0b	Return the device_id from get_auth_by_req	2015-01-28 15:43:41 +00:00
Paul "LeoNerd" Evans	0c14a699bb	More unit-testing of REST errors	2015-01-27 18:07:21 +00:00
Paul "LeoNerd" Evans	54e513b4e6	Move storage of user filters into real datastore layer; now have to mock it out in the REST-level tests	2015-01-27 17:48:13 +00:00
Paul "LeoNerd" Evans	f9958f3404	Use new V2AlphaRestTestCase	2015-01-27 13:17:25 +00:00
Paul "LeoNerd" Evans	0484d7f6e9	Merge branch 'develop' into client_v2_filter	2015-01-27 13:11:03 +00:00
Paul "LeoNerd" Evans	57d2bfca3f	Initial cut of a shared base class for REST unit tests	2015-01-27 13:09:57 +00:00
Paul "LeoNerd" Evans	39c1892b22	Minor changes to v2_alpha filter REST test to allow the setUp method to be shareable	2015-01-27 13:03:31 +00:00
Paul "LeoNerd" Evans	37b8a71f10	Initial trivial REST test of v2_alpha filter API	2015-01-26 15:27:40 +00:00
Paul "LeoNerd" Evans	d07dfe5392	Create (empty) v2_alpha REST tests directory	2015-01-26 14:32:17 +00:00
Mark Haines	5759bec43c	Replace hs.parse_userid with UserID.from_string	2015-01-23 11:47:15 +00:00
Mark Haines	7256def8e4	Merge rest servlets into the client json resource object	2015-01-23 10:37:38 +00:00
Mark Haines	53584420a5	Move client rest tests back under rest	2015-01-22 16:13:27 +00:00