| Commit message (Expand) | Author | Age | Files | Lines |
* | Fix pyflakes warnings | Mark Haines | 2014-08-28 | 1 | -5/+0 |
* | Merge branch 'develop' into storage_transactions | Mark Haines | 2014-08-27 | 1 | -1/+6 |
|\ |
|
| * | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor | Erik Johnston | 2014-08-27 | 1 | -1/+14 |
| |\ |
|
| * | | WIP: Completely change how event streaming and pagination work. This reflects... | Erik Johnston | 2014-08-26 | 1 | -1/+6 |
* | | | 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 addition... | Kegan Dougal | 2014-08-27 | 1 | -1/+9 |
| |/ |
|
* / | 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 FileUp... | Kegan Dougal | 2014-08-18 | 1 | -0/+2 |
* | Removed http_server from HomeServer. Updated unit tests to use either resourc... | Kegan Dougal | 2014-08-14 | 1 | -2/+3 |
* | Start phasing out HttpServer: we should be using Resources instead. Added res... | Kegan Dougal | 2014-08-14 | 1 | -4/+4 |
* | Add a HomeServer.parse_roomalias() to avoid having to RoomAlias.from_sring(..... | Paul "LeoNerd" Evans | 2014-08-13 | 1 | -1/+6 |
* | Don't pass host_web_client flag to register_servlets, it needs to be a Resour... | Kegan Dougal | 2014-08-13 | 1 | -3/+1 |
* | Added a -w flag which will host the web client if specified. Currently this j... | Kegan Dougal | 2014-08-13 | 1 | -4/+10 |
* | 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 |