synapse-product/synapse
Mark Haines dc3c2823ac Merge branch 'develop' into event_signing
Conflicts:
	synapse/federation/replication.py
2014-10-17 17:33:58 +01:00
..
api Merge branch 'develop' into event_signing 2014-10-17 17:33:58 +01:00
app Merge branch develop into server2server_signing 2014-10-13 10:58:50 +01:00
config Merge branch develop into server2server_signing 2014-10-13 10:58:50 +01:00
crypto Rename 'meta' to 'unsigned' 2014-10-17 16:50:04 +01:00
federation Merge branch 'develop' into event_signing 2014-10-17 17:33:58 +01:00
handlers SPEC-7: Don't stamp event contents with 'hsob_ts' 2014-10-17 16:55:55 +01:00
http remove debugging logging for signing requests 2014-10-14 11:46:13 +01:00
rest Make sure to return an empty JSON object ({}) from presence PUT/POST requests rather than an empty string ("") because most deserialisers won't like the latter 2014-10-14 16:48:15 +01:00
storage Merge branch 'develop' into event_signing 2014-10-17 17:33:58 +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 Include hashes of previous pdus when referencing them 2014-10-16 23:25:12 +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