Mark Haines dc3c2823ac Merge branch 'develop' into event_signing ...

Conflicts:
	synapse/federation/replication.py

2014-10-17 17:33:58 +01:00

..

schema

keep 'origin_server_ts' as 'ts' in the database to avoid needlessly updating schema

2014-10-17 17:31:48 +01:00

__init__.py

Merge branch 'develop' into event_signing

2014-10-17 17:33:58 +01:00

_base.py

keep 'origin_server_ts' as 'ts' in the database to avoid needlessly updating schema

2014-10-17 17:31:48 +01:00

directory.py

SYN-2: Allow server admins to delete room aliases

2014-09-30 11:31:42 +01:00

feedback.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

keys.py

Respond with more helpful error messages for unsigned requests

2014-10-13 16:39:15 +01:00

pdu.py

keep 'origin_server_ts' as 'ts' in the database to avoid needlessly updating schema

2014-10-17 17:31:48 +01:00

presence.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

profile.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

registration.py

Update docstring

2014-09-29 15:35:54 +01:00

room.py

Rename deletions to redactions

2014-09-24 15:27:59 +01:00

roommember.py

pyflakes cleanup

2014-09-30 12:38:38 +01:00

signatures.py

Hash the same content covered by the signature when referencing previous PDUs rather than reusing the PDU content hashes

2014-10-17 11:40:35 +01:00

stream.py

Add LIMIT to scalar subquery

2014-09-25 15:51:21 +01:00

transactions.py

keep 'origin_server_ts' as 'ts' in the database to avoid needlessly updating schema

2014-10-17 17:31:48 +01:00