Erik Johnston 10294b6082 Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor ...

Conflicts:
	synapse/storage/_base.py

2014-08-14 10:01:04 +01:00

..

api

fix whitespace

2014-08-14 02:14:15 +01:00

app

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

crypto

add in whitespace after copyright statements to improve legibility

2014-08-13 03:14:34 +01:00

federation

when we're talking about backfilling data in federation, call it backfilling - not pagination.

2014-08-13 18:17:09 +01:00

handlers

An initial hack at storing presence state-change mtimes in database and presenting age durations to clients/federation events

2014-08-13 19:19:15 +01:00

http

fix http client GET parameters; somehow missing named param. how could this have ever worked!?

2014-08-14 02:59:54 +01:00

rest

Implement directory service federation by Federation Queries; avoid local_only hack; add unit tests

2014-08-13 18:03:41 +01:00

storage

Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor

2014-08-14 10:01:04 +01:00

util

add in whitespace after copyright statements to improve legibility

2014-08-13 03:14:34 +01:00

__init__.py

add in whitespace after copyright statements to improve legibility

2014-08-13 03:14:34 +01:00

server.py

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

state.py

add in whitespace after copyright statements to improve legibility

2014-08-13 03:14:34 +01:00

types.py

add in whitespace after copyright statements to improve legibility

2014-08-13 03:14:34 +01:00