Mark Haines
|
1d95e78759
|
Merge branch 'develop' into storage_transactions
|
2014-08-27 16:54:12 +01:00 |
|
Erik Johnston
|
47519cd8c2
|
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
Conflicts:
synapse/handlers/events.py
synapse/rest/events.py
synapse/rest/room.py
|
2014-08-27 14:13:06 +01:00 |
|
Paul "LeoNerd" Evans
|
d63f775e06
|
Added parse_roomid() helper
|
2014-08-27 11:45:16 +01:00 |
|
Mark Haines
|
bf05218c4b
|
Merge branch 'develop' into storage_transactions
|
2014-08-27 11:19:37 +01:00 |
|
Kegan Dougal
|
dfa0cd1d90
|
Modified /join/$identifier to support $identifier being a room ID in addition to a room alias.
|
2014-08-27 09:43:42 +01:00 |
|
Mark Haines
|
d2798de660
|
Fold federation/handler into handlers/federation
|
2014-08-26 19:49:42 +01:00 |
|
Erik Johnston
|
3a2a5b959c
|
WIP: Completely change how event streaming and pagination work. This reflects the change in the underlying storage model.
|
2014-08-26 18:57:46 +01:00 |
|
Erik Johnston
|
5670da1c1e
|
Add ts field to all events.
|
2014-08-21 17:46:52 +01:00 |
|
Kegan Dougal
|
a18b1a649c
|
Added /matrix/content path, HS resource_for_content_repo attribute and FileUploadResource. Added stub methods.
|
2014-08-18 17:18:54 +01:00 |
|
Kegan Dougal
|
9a1638ed21
|
Removed http_server from HomeServer. Updated unit tests to use either resource_for_federation or resource_for_client depending on what is being tested.
|
2014-08-14 10:18:54 +01:00 |
|
Kegan Dougal
|
9f863d3466
|
Start phasing out HttpServer: we should be using Resources instead. Added 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.
|
2014-08-14 09:55:16 +01:00 |
|
Paul "LeoNerd" Evans
|
7fb93f2a47
|
Add a HomeServer.parse_roomalias() to avoid having to RoomAlias.from_sring(..., hs=hs) - similar to parse_userid()
|
2014-08-13 18:03:41 +01:00 |
|
Kegan Dougal
|
2da1e1526e
|
Don't pass host_web_client flag to register_servlets, it needs to be a Resource not a RestServlet.
|
2014-08-13 15:57:58 +01:00 |
|
Kegan Dougal
|
7f40fa1d46
|
Added a -w flag which will host the web client if specified. Currently this just delegates to the webclient RestServlet.
|
2014-08-13 13:50:01 +01:00 |
|
Matthew Hodgson
|
f98e6380f1
|
add in whitespace after copyright statements to improve legibility
|
2014-08-13 03:14:34 +01:00 |
|
matrix.org
|
4f475c7697
|
Reference Matrix Home Server
|
2014-08-12 15:10:52 +01:00 |
|