111 Commits

Author	SHA1	Message	Date
David Baker	d72ce4da64	Merge branch 'develop' of github.com:matrix-org/synapse into develop ... Conflicts: synapse/http/client.py	2014-09-03 18:25:17 +01:00
David Baker	d6ecbbdf0a	Add support for registering with a threepid to the HS (get credentials from the client and check them against an ID server).	2014-09-03 18:22:27 +01:00
Matthew Hodgson	8a7c1d6a00	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
Kegan Dougal	7fc84c7019	Make retrying requests on DNS failures configurable, and turn off retrying only in directory.get_association	2014-09-03 14:26:52 +01:00
Kegan Dougal	b1195c125f	hs: Updated synapse.http.client to handle DNSLookupErrors and bail immediately.	2014-09-03 13:51:17 +01:00
Mark Haines	5452a8ee29	Fix SSL for federation http client	2014-09-01 18:43:08 +01:00
Mark Haines	a53946a8a1	Enable SSL for s2s http client	2014-09-01 18:30:00 +01:00
Matthew Hodgson	a4da962bab	fix http client GET parameters; somehow missing named param. how could this have ever worked!?	2014-08-14 02:59:54 +01:00
Paul "LeoNerd" Evans	1ddae5f40b	Update get_json()'s documentation to match the actual observed behaviour	2014-08-13 17:23:49 +01:00
Matthew Hodgson	f98e6380f1	add in whitespace after copyright statements to improve legibility	2014-08-13 03:14:34 +01:00
matrix.org	4f475c7697	Reference Matrix Home Server	2014-08-12 15:10:52 +01:00