forked-synapse/synapse/storage
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
..
schema Merge branch 'develop' into server2server_signing 2014-09-30 17:55:06 +01:00
__init__.py Merge branch 'develop' into server2server_signing 2014-09-30 17:55:06 +01:00
_base.py Rename deletions to redactions 2014-09-24 15:27:59 +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 SYN-75 Verify signatures on server to server transactions 2014-09-30 15:15:10 +01:00
pdu.py Merge remote-tracking branch 'origin/develop' into test-sqlite-memory 2014-09-12 17:20:06 +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
stream.py Add LIMIT to scalar subquery 2014-09-25 15:51:21 +01:00
transactions.py Add a .runInteraction() method on SQLBaseStore itself to wrap the .db_pool 2014-09-12 14:28:07 +01:00