Mark Haines 9605593d11 Merge branch 'develop' into server2server_signing ...

Conflicts:
	synapse/storage/__init__.py
	tests/rest/test_presence.py

2014-09-30 17:55:06 +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

SYN-75 Verify signatures on server to server transactions

2014-09-30 15:15:10 +01:00

handlers

Merge branch 'develop' into server2server_signing

2014-09-30 17:55:06 +01: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

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

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_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

Merge branch 'develop' into server2server_signing

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