Mark Haines dc3c2823ac Merge branch 'develop' into event_signing ...

Conflicts:
	synapse/federation/replication.py

2014-10-17 17:33:58 +01: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

Merge branch 'develop' into event_signing

2014-10-17 17:33:58 +01:00

handlers

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

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

rest

Sign outgoing PDUs.

2014-10-16 00:09:48 +01:00

storage

SYN-2: Allow server admins to delete room aliases

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

util

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

__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

Sign outgoing PDUs.

2014-10-16 00:09:48 +01:00