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
..
api	Merge branch 'develop' into server2server_signing	2014-09-30 17:55:06 +01:00
app	Add a _matrix/key/v1 resource with the verification keys of the local server	2014-09-23 18:43:34 +01:00
config	Merge branch 'develop' into server2server_signing	2014-09-30 17:55:06 +01:00
crypto	SYN-75 Verify signatures on server to server transactions	2014-09-30 15:15:10 +01:00
federation	SYN-75 Verify signatures on server to server transactions	2014-09-30 15:15:10 +01:00
handlers	SYN-2: Allow server admins to delete room aliases	2014-09-30 11:31:42 +01:00
http	Fix a few pyflakes errors in the server_key_resource	2014-09-23 18:43:34 +01:00
rest	SYN-2: Allow server admins to delete room aliases	2014-09-30 11:31:42 +01:00
storage	Merge branch 'develop' into server2server_signing	2014-09-30 17:55:06 +01:00
streams	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
util	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
__init__.py	Bump version and changelog	2014-09-25 18:05:06 +01:00
notifier.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
server.py	Merge branch 'develop' into server2server_signing	2014-09-30 17:55:06 +01:00
state.py	Make the state resolution use actual power levels rather than taking them from a Pdu key.	2014-09-12 17:11:09 +01:00
types.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