summary refs log tree commit diff
path: root/synapse/server.py (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop' into storage_transactionsMark Haines2014-08-271-1/+6
|\ | | | | | | | | | | Conflicts: synapse/handlers/room.py synapse/storage/stream.py
| * Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactorErik Johnston2014-08-271-1/+14
| |\ | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/events.py synapse/rest/events.py synapse/rest/room.py
| * | WIP: Completely change how event streaming and pagination work. This ↵Erik Johnston2014-08-261-1/+6
| | | | | | | | | | | | reflects the change in the underlying storage model.
* | | Merge branch 'develop' into storage_transactionsMark Haines2014-08-271-0/+5
|\ \ \ | | |/ | |/|
| * | Added parse_roomid() helperPaul "LeoNerd" Evans2014-08-271-0/+5
| | |
* | | Merge branch 'develop' into storage_transactionsMark Haines2014-08-271-1/+9
|\| |
| * | Modified /join/$identifier to support $identifier being a room ID in ↵Kegan Dougal2014-08-271-1/+9
| |/ | | | | | | addition to a room alias.
* / Fold federation/handler into handlers/federationMark Haines2014-08-261-5/+0
|/
* Add ts field to all events.Erik Johnston2014-08-211-1/+1
|
* Added /matrix/content path, HS resource_for_content_repo attribute and ↵Kegan Dougal2014-08-181-0/+2
| | | | FileUploadResource. Added stub methods.
* Removed http_server from HomeServer. Updated unit tests to use either ↵Kegan Dougal2014-08-141-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 Dougal2014-08-141-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" Evans2014-08-131-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 Dougal2014-08-131-3/+1
| | | | Resource not a RestServlet.
* Added a -w flag which will host the web client if specified. Currently this ↵Kegan Dougal2014-08-131-4/+10
| | | | just delegates to the webclient RestServlet.
* add in whitespace after copyright statements to improve legibilityMatthew Hodgson2014-08-131-0/+1
|
* Reference Matrix Home Servermatrix.org2014-08-121-0/+176