Richard van der Hoff 7314bf4682 Merge branch 'develop' into rav/get_devices_api ...

(pick up PR #938 in the hope of fixing the UTs)

2016-07-20 17:40:00 +01:00

..

api

Record device_id in client_ips

2016-07-20 16:41:03 +01:00

appservice

Fix flake8 warnings for tests

2016-02-19 15:34:38 +00:00

config

Add function to load config without generating it

2016-06-09 18:50:38 +01:00

crypto

Fix flake8 warnings for tests

2016-02-19 15:34:38 +00:00

events

Fix flake8 warnings for tests

2016-02-19 15:34:38 +00:00

handlers

GET /devices endpoint

2016-07-20 16:42:32 +01:00

metrics

Change CacheMetrics to be quicker

2016-06-03 11:26:52 +01:00

replication

Remove room name & alias test

2016-06-24 13:34:20 +01:00

rest

Register a device_id in the /v2/register flow.

2016-07-20 16:38:27 +01:00

storage

GET /devices endpoint

2016-07-20 16:42:32 +01:00

util

Add ReadWriteLock

2016-07-05 15:23:17 +01:00

__init__.py

Fix flake8 warnings for tests

2016-02-19 15:34:38 +00:00

test_distributor.py

Fix flake8 warnings for tests

2016-02-19 15:34:38 +00:00

test_dns.py

Tests

2016-04-06 10:12:30 +01:00

test_state.py

Create log context in Measure if one doesn't exist

2016-04-18 16:08:32 +01:00

test_test_utils.py

Fix flake8 warnings for tests

2016-02-19 15:34:38 +00:00

test_types.py

Remove redundated BaseHomeServer

2016-01-26 13:52:29 +00:00

unittest.py

Fix flake8 warnings for tests

2016-02-19 15:34:38 +00:00

utils.py

Rework ldap integration with ldap3

2016-06-22 17:51:59 +02:00