David Baker 6532b6e607 Merge branch 'develop' into csauth ...

Conflicts:
	synapse/http/server.py

2015-04-24 09:37:54 +01:00

..

api

Merge branch 'develop' into application-services

2015-02-11 16:43:26 +00:00

appservice

Fix thinko whereby events *for the AS specifically* were not passed on.

2015-03-31 16:44:45 +01:00

federation

Factor out some of the common homeserver setup code into a

2015-02-11 11:37:30 +00:00

handlers

Remove users from the remote_offline_serials list (and clean up empty elements) when they go online again

2015-04-23 19:01:37 +01:00

metrics

Add an .inc_by() method to CounterMetric; implement DistributionMetric a neater way

2015-03-12 16:24:51 +00:00

rest

Merge branch 'develop' into csauth

2015-04-17 13:51:10 +01:00

storage

Merge branch 'develop' into csauth

2015-04-17 13:51:10 +01:00

util

Add a lru cache class

2015-02-11 14:52:23 +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

Fix tests

2015-02-09 14:23:57 +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

Update tests

2015-02-19 14:34:32 +00:00