Mark Haines 7c06399512 Merge branch 'develop' into request_logging ...

Conflicts:
	synapse/config/logger.py

2014-10-30 11:13:58 +00:00

..

api

Have all unit tests import from our own subclass of trial's unittest TestCase; set up logging in ONE PLACE ONLY

2014-09-12 18:46:13 +01:00

events

Have all unit tests import from our own subclass of trial's unittest TestCase; set up logging in ONE PLACE ONLY

2014-09-12 18:46:13 +01:00

federation

keep 'origin_server_ts' as 'ts' in the database to avoid needlessly updating schema

2014-10-17 17:31:48 +01:00

handlers

Fix an off-by-one bug in presence event stream pagination; this might be responsible for any number of bug reports

2014-10-29 16:16:01 +00:00

rest

Merge branch 'develop' into server2server_signing

2014-09-30 17:55:06 +01:00

storage

SYN-2: Allow server admins to delete room aliases

2014-09-30 11:31:42 +01:00

util

Add a request-id to each log line

2014-10-30 01:21:33 +00:00

__init__.py

fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.

2014-09-03 17:31:57 +01:00

test_distributor.py

Have all unit tests import from our own subclass of trial's unittest TestCase; set up logging in ONE PLACE ONLY

2014-09-12 18:46:13 +01:00

test_state.py

SPEC-7: Rename 'ts' to 'origin_server_ts'

2014-10-17 17:12:25 +01:00

test_types.py

Have all unit tests import from our own subclass of trial's unittest TestCase; set up logging in ONE PLACE ONLY

2014-09-12 18:46:13 +01:00

unittest.py

Added a useful unit test primitive for asserting object attributes

2014-09-17 15:56:40 +01:00

utils.py

Raise a SynapseError if the authorisation header is missing or malformed

2014-10-13 15:53:18 +01:00