Mark Haines 9605593d11 Merge branch 'develop' into server2server_signing ... Conflicts: synapse/storage/__init__.py tests/rest/test_presence.py		2014-09-30 17:55:06 +01: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
_base.py	Added a TODO note about YAML modeline for editors	2014-09-03 19:30:48 +01:00
captcha.py	Allow a (hidden undocumented) key to m.login.recaptcha to specify a shared secret to allow bots to bypass the ReCAPTCHA test (SYN-60)	2014-09-23 14:29:08 +01:00
database.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
email.py	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
homeserver.py	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
logger.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
ratelimiting.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
repository.py	pyflakes cleanup	2014-09-30 12:38:38 +01:00
server.py	Read signing keys using methods from syutil. convert keys that are in the wrong format	2014-09-23 18:43:34 +01:00
tls.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
voip.py	Just use a yaml list for turn servers	2014-09-25 19:18:32 +02:00