64 Commits

Author	SHA1	Message	Date
Mark Haines	4ad8b45155	Merge branch 'develop' into key_distribution ... Conflicts: synapse/config/homeserver.py	2015-04-29 13:15:14 +01:00
Mark Haines	c8c710eca7	Move the key related config parser into a separate file	2015-04-24 10:22:22 +01:00
David Baker	2e0d9219b9	Remove now-redundant email config	2015-04-23 11:45:29 +01:00
Kegan Dougal	af853a4cdb	Add AppServiceConfig	2015-03-31 09:22:31 +01:00
Paul "LeoNerd" Evans	5b6e11d560	Commandline option to enable metrics system	2015-03-12 16:24:50 +00:00
Erik Johnston	81163f822e	Add config option to disable registration.	2015-02-19 14:16:53 +00:00
Mark Haines	adb04b1e57	Update copyright notices	2015-01-06 13:21:39 +00:00
David Baker	14ed6799d7	Add support for TURN servers as per the TURN REST API (http://tools.ietf.org/html/draft-uberti-behave-turn-rest-00)	2014-09-23 17:16:13 +01:00
Kegan Dougal	cc83b06cd1	Added support for the HS to send emails. Use it to send password resets. Added email_smtp_server and email_from_address config args. Added emailutils.	2014-09-16 12:36:39 +01:00
Kegan Dougal	0b9e1e7b56	Added a captcha config to the HS, to enable registration captcha checking and for the recaptcha private key.	2014-09-05 17:58:06 -07: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
Mark Haines	ee2bcdec65	Limit the size of uploads	2014-09-03 17:04:16 +01:00
Mark Haines	c7a7cdf734	Add ratelimiting function to basehandler	2014-09-02 17:57:04 +01:00
Mark Haines	d9ebe531ed	Add config tree to synapse. Add support for reading config from a file	2014-08-31 16:06:39 +01:00