Erik Johnston bb4a20174c Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization ...

Conflicts:
	synapse/federation/transport.py
	synapse/handlers/message.py

2014-10-27 10:20:44 +00:00

..

api

Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization

2014-10-27 10:20:44 +00:00

app

Merge branch develop into server2server_signing

2014-10-13 10:58:50 +01:00

config

Fix auto generating signing_keys

2014-10-18 16:56:44 +01:00

crypto

Add log message if we can't enable ECC. Require pyopenssl>=0.14 since 0.13 doesn't seem to have ECC

2014-10-24 19:27:12 +01:00

federation

Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization

2014-10-27 10:20:44 +00:00

handlers

Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization

2014-10-27 10:20:44 +00:00

http

Add get_json method to 3pid http client. Better logging for errors in 3pid requests

2014-10-20 14:10:08 +01:00

rest

Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization

2014-10-27 10:20:44 +00:00

storage

Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization

2014-10-27 10:20:44 +00: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 the other version

2014-10-18 00:29:55 +02: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

Fix bug where people could join private rooms

2014-10-17 19:37:41 +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