Mark Haines 7c06399512 Merge branch 'develop' into request_logging ... Conflicts: synapse/config/logger.py		2014-10-30 11:13:58 +00:00
..
schema	Bump database version number.	2014-10-17 20:26:18 +01:00
__init__.py	Wrap preparing the database in a transaction. Otherwise it will take many seconds to complete because sqlite will create a transaction per statement	2014-10-24 19:04:26 +01:00
_base.py	Add a request-id to each log line	2014-10-30 01:21:33 +00: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	Fix pep8 warnings	2014-10-30 11:10:17 +00: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	Fix pep8 warnings	2014-10-30 11:10:17 +00: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