11 Commits

Author	SHA1	Message	Date
Mark Haines	0d872f5aa6	Merge pull request #50 from matrix-org/application-services ... Application Services	2015-02-13 15:06:14 +00:00
Erik Johnston	4ebbaf0d43	Blunty replace json with simplejson	2015-02-11 14:23:10 +00:00
Kegan Dougal	9978c5c103	Merge branch 'develop' into application-services	2015-02-11 10:03:24 +00:00
Mark Haines	84a769cdb7	Fix code-style	2015-02-10 17:58:36 +00:00
Kegan Dougal	c3ae8def75	Grant ASes the ability to delete aliases in their own namespace.	2015-02-06 11:32:07 +00:00
Kegan Dougal	e426df8e10	Grant ASes the ability to create alias in their own namespace. ... Add a new errcode type M_EXCLUSIVE when users try to create aliases inside AS namespaces, and when ASes try to create aliases outside their own namespace.	2015-02-06 10:57:14 +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
Mark Haines	4be637cb12	Extract the client v1 base RestServlet to a separate class	2015-01-23 14:09:51 +00:00
Mark Haines	ada711504e	Replace hs.parse_roomalias with RoomAlias.from_string	2015-01-23 13:21:58 +00:00
Mark Haines	97c68c508d	Move rest APIs back under the rest directory	2015-01-22 16:10:07 +00:00