Mark Haines 33b3e04049 Merge branch 'develop' into daniel/removesomelies ...

Conflicts:
	synapse/notifier.py

2015-11-04 16:01:00 +00:00

..

api

Refactor api.filtering to have a Filter API

2015-10-20 15:33:25 +01:00

appservice

Make the appservice use 'users_in_room' rather than get_room_members since it is cached

2015-05-22 11:01:28 +01:00

crypto

Invoke EventBuilder directly instead of going via the EventBuilderFactory

2015-10-19 17:42:34 +01:00

events

Add some unit tests of prune_events()

2015-10-16 19:56:46 +01:00

federation

Make work in both Maria and SQLite. Fix tests

2015-04-01 14:12:33 +01:00

handlers

Move token generation to auth handler

2015-08-20 11:35:56 +01:00

metrics

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

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

rest

Support clients supplying older tokens, fix short poll test

2015-10-30 16:38:35 +00:00

storage

Remove more unused parameters

2015-11-02 15:31:57 +00:00

util

Remove the LockManager class because it wasn't being used

2015-11-04 14:08:15 +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

Remove call to recently removed function in mock

2015-08-11 16:56:30 +01:00

test_state.py

Merge branch 'erikj/check_room_exists' into erikj/unfederatable

2015-09-01 15:58:10 +01:00

test_test_utils.py

Implement .cancel_call_later() in MockClock

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

test_types.py

Fix a 500 error resulting from empty room_ids

2015-10-26 18:44:03 +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

Remove more unused parameters

2015-11-02 15:31:57 +00:00