Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix unit tests | Kegan Dougal | 2015-02-27 | 1 | -0/+3 |
| | |||||
* | Update tests | Erik Johnston | 2015-02-19 | 1 | -0/+1 |
| | |||||
* | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-11 | 5 | -133/+29 |
|\ | |||||
| * | Factor out some of the common homeserver setup code into a | Mark Haines | 2015-02-11 | 5 | -133/+29 |
| | | | | | | | | setup_test_homeserver function in utils. | ||||
* | | Modify auth.get_user_by_req for authing appservices directly. | Kegan Dougal | 2015-02-09 | 1 | -0/+3 |
|/ | | | | | | Add logic to map the appservice token to the autogenned appservice user ID. Add unit tests for all forms of get_user_by_req (user/appservice, valid/bad/missing tokens) | ||||
* | Extract the id token of the token when authing users, include the token and ↵ | Mark Haines | 2015-01-28 | 3 | -0/+10 |
| | | | | device_id in the internal meta data for the event along with the transaction id when sending events | ||||
* | Return the device_id from get_auth_by_req | Mark Haines | 2015-01-28 | 2 | -2/+2 |
| | |||||
* | Replace hs.parse_userid with UserID.from_string | Mark Haines | 2015-01-23 | 4 | -24/+24 |
| | |||||
* | Merge rest servlets into the client json resource object | Mark Haines | 2015-01-23 | 2 | -4/+9 |
| | |||||
* | Move client rest tests back under rest | Mark Haines | 2015-01-22 | 7 | -0/+2128 |