Erik Johnston 2ebf795c0a Merge branch 'develop' of github.com:matrix-org/synapse into rejections ...

Conflicts:
	synapse/storage/__init__.py
	synapse/storage/schema/delta/v12.sql

2015-01-30 11:10:37 +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

federation

Supply auth_chain along with current state in '/state/', fetch auth events from a remote server if we are missing some of them

2014-12-18 18:47:13 +00:00

handlers

Initial implementation of auth conflict resolution

2015-01-29 16:52:33 +00:00

rest

Merge pull request #36 from matrix-org/device_id_from_access_token

2015-01-28 17:19:28 +00:00

storage

Extract the id token of the token when authing users, include the token and device_id in the internal meta data for the event along with the transaction id when sending events

2015-01-28 16:58:23 +00: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

Replace distributor deferred list, with a simple for loop until I understand why the former breaks and the latter doesn't

2014-12-18 17:47:00 +00:00

test_state.py

Implement new state resolution algorithm

2015-01-21 16:27:04 +00:00

test_test_utils.py

Implement .cancel_call_later() in MockClock

2014-12-10 19:26:52 +00:00

test_types.py

Replace hs.parse_roomalias with RoomAlias.from_string

2015-01-23 13:21:58 +00:00

unittest.py

Don't make @unittest.DEBUG print the huge amount of verbosity generated by the synapse.storage loggers

2015-01-12 18:16:27 +00:00

utils.py

Have MockClock detect attempts to cancel expired timers, to prevent a repeat of SYN-230

2015-01-13 16:58:36 +00:00