Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'develop' into storage_transactions | Mark Haines | 2014-08-27 | 1 | -0/+5 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Added parse_roomid() helper | Paul "LeoNerd" Evans | 2014-08-27 | 1 | -0/+5 | |
| | | | ||||||
* | | | Merge branch 'develop' into storage_transactions | Mark Haines | 2014-08-27 | 1 | -1/+9 | |
|\| | | ||||||
| * | | Modified /join/$identifier to support $identifier being a room ID in ↵ | Kegan Dougal | 2014-08-27 | 1 | -1/+9 | |
| |/ | | | | | | | addition to a room alias. | |||||
* / | Fold federation/handler into handlers/federation | Mark Haines | 2014-08-26 | 1 | -5/+0 | |
|/ | ||||||
* | Add ts field to all events. | Erik Johnston | 2014-08-21 | 1 | -1/+1 | |
| | ||||||
* | Added /matrix/content path, HS resource_for_content_repo attribute and ↵ | Kegan Dougal | 2014-08-18 | 1 | -0/+2 | |
| | | | | FileUploadResource. Added stub methods. | |||||
* | Removed http_server from HomeServer. Updated unit tests to use either ↵ | Kegan Dougal | 2014-08-14 | 1 | -2/+3 | |
| | | | | resource_for_federation or resource_for_client depending on what is being tested. | |||||
* | Start phasing out HttpServer: we should be using Resources instead. Added ↵ | Kegan Dougal | 2014-08-14 | 1 | -4/+4 | |
| | | | | resource_for_client/federation/web_client to the HomeServer and hooked the C-S servlets to operate on resource_for_client. Dynamically construct the Resource tree. | |||||
* | Add a HomeServer.parse_roomalias() to avoid having to ↵ | Paul "LeoNerd" Evans | 2014-08-13 | 1 | -1/+6 | |
| | | | | RoomAlias.from_sring(..., hs=hs) - similar to parse_userid() | |||||
* | Don't pass host_web_client flag to register_servlets, it needs to be a ↵ | Kegan Dougal | 2014-08-13 | 1 | -3/+1 | |
| | | | | Resource not a RestServlet. | |||||
* | Added a -w flag which will host the web client if specified. Currently this ↵ | Kegan Dougal | 2014-08-13 | 1 | -4/+10 | |
| | | | | just delegates to the webclient RestServlet. | |||||
* | add in whitespace after copyright statements to improve legibility | Matthew Hodgson | 2014-08-13 | 1 | -0/+1 | |
| | ||||||
* | Reference Matrix Home Server | matrix.org | 2014-08-12 | 1 | -0/+176 | |