Erik Johnston 347242a5c4 Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor ... Conflicts: tests/rest/test_presence.py tests/rest/test_rooms.py tests/utils.py		2014-08-19 14:48:19 +01:00
..
api	Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor	2014-08-19 14:48:19 +01:00
app	Implemented GETs for the ContentRepoResource. It all actually appears to be working.	2014-08-18 17:18:54 +01:00
crypto	add in whitespace after copyright statements to improve legibility	2014-08-13 03:14:34 +01:00
federation	Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor	2014-08-19 14:48:19 +01:00
handlers	Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor	2014-08-19 14:48:19 +01:00
http	Reduce the amount of incredibly spammy stack traces. Expected errors (e.g. SynapseErrors) shouldn't have their full trace logged every time. Don't send responses to disconnected requests.	2014-08-19 10:56:43 +01:00
rest	Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor	2014-08-19 14:48:19 +01:00
storage	Fix bug where we sometimes set min_token to None.	2014-08-19 14:32:47 +01:00
util	Put some DEBUG logging in lockutils.py so we can debug roomlocks	2014-08-14 16:06:05 +01:00
__init__.py	add in whitespace after copyright statements to improve legibility	2014-08-13 03:14:34 +01:00
server.py	Added /matrix/content path, HS resource_for_content_repo attribute and FileUploadResource. Added stub methods.	2014-08-18 17:18:54 +01:00
state.py	Rename method name to not clash with other ones in storage.	2014-08-15 16:47:48 +01:00
types.py	Deny __iter__ on UserID/RoomID/RoomName instances as it's a subtle bug that will bite you	2014-08-19 11:16:23 +01:00