Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Have TypingNotificationEventSource.get_new_events_for_user() return a ↵ | Paul "LeoNerd" Evans | 2015-04-15 | 1 | -1/+2 | |
| |/ | | | | | | | deferred, for consistency and extensibility | |||||
* / | Make work in both Maria and SQLite. Fix tests | Erik Johnston | 2015-04-01 | 1 | -9/+0 | |
|/ | ||||||
* | Fix tests | Erik Johnston | 2015-03-09 | 1 | -4/+4 | |
| | ||||||
* | 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 | 6 | -141/+34 | |
|\ | ||||||
| * | Factor out some of the common homeserver setup code into a | Mark Haines | 2015-02-11 | 6 | -141/+34 | |
| | | | | | | | | setup_test_homeserver function in utils. | |||||
* | | Modify auth.get_user_by_req for authing appservices directly. | Kegan Dougal | 2015-02-09 | 2 | -1/+6 | |
|/ | | | | | | 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) | |||||
* | Merge in auth changes from develop | Mark Haines | 2015-01-29 | 1 | -0/+1 | |
| | ||||||
* | Merge changes from develop | Mark Haines | 2015-01-29 | 4 | -2/+12 | |
|\ | ||||||
| * | Merge pull request #36 from matrix-org/device_id_from_access_token | Mark Haines | 2015-01-28 | 4 | -2/+12 | |
| |\ | | | | | | | Extract the device id and token id from the access token when autheniticating users | |||||
| | * | 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 | |
| | | | ||||||
* | | | More unit-testing of REST errors | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -1/+35 | |
| | | | ||||||
* | | | Move storage of user filters into real datastore layer; now have to mock it ↵ | Paul "LeoNerd" Evans | 2015-01-27 | 2 | -3/+27 | |
| | | | | | | | | | | | | out in the REST-level tests | |||||
* | | | Use new V2AlphaRestTestCase | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -38/+2 | |
| | | | ||||||
* | | | Merge branch 'develop' into client_v2_filter | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -0/+45 | |
|\| | | ||||||
| * | | Initial cut of a shared base class for REST unit tests | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -0/+45 | |
| |/ | ||||||
* | | Minor changes to v2_alpha filter REST test to allow the setUp method to be ↵ | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -5/+7 | |
| | | | | | | | | shareable | |||||
* | | Initial trivial REST test of v2_alpha filter API | Paul "LeoNerd" Evans | 2015-01-26 | 1 | -0/+74 | |
|/ | ||||||
* | Create (empty) v2_alpha REST tests directory | Paul "LeoNerd" Evans | 2015-01-26 | 1 | -0/+15 | |
| | ||||||
* | 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 | 8 | -0/+2142 | |