David Baker b56730bb6e Merge branch 'develop' into pushers ...

Conflicts:
	synapse/api/errors.py
	synapse/server.py
	synapse/storage/__init__.py

2014-12-18 15:15:22 +00:00

..

__init__.py

Fix pep8 warnings

2014-10-30 11:10:17 +00:00

client.py

More work on pushers. Attempt to do HTTP pokes. Not sure if the actual HTTP pokes work or not yet but the retry semantics are pretty good.

2014-11-21 12:21:00 +00:00

endpoint.py

Fix pep8 and pyflakes warnings

2014-11-20 18:00:10 +00:00

matrixfederationclient.py

Limit the size of images that are thumbnailed serverside. Limit the size of file that a server will download from a remote server

2014-12-11 14:19:32 +00:00

server_key_resource.py

Fix a few pyflakes errors in the server_key_resource

2014-09-23 18:43:34 +01:00

server.py

Fix tests and remove debug logging

2014-12-12 15:08:29 +00:00