Erik Johnston 1bd540ef79 Merge branch 'develop' of github.com:matrix-org/synapse into rejections ... Conflicts: synapse/storage/schema/im.sql		2015-01-30 15:16:38 +00:00
..
schema	Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage	2015-01-30 14:57:33 +00:00
__init__.py	Merge pull request #42 from matrix-org/replication_split	2015-01-30 15:14:10 +00:00
_base.py	Be more specific in naming columns in selects.	2015-01-30 14:48:11 +00:00
directory.py	Update copyright notices	2015-01-06 13:21:39 +00:00
event_federation.py	Update copyright notices	2015-01-06 13:21:39 +00:00
feedback.py	Update copyright notices	2015-01-06 13:21:39 +00:00
filtering.py	Use 'in' to test if the key exists, remove unused _filters_for_user	2015-01-30 14:54:06 +00:00
keys.py	Update copyright notices	2015-01-06 13:21:39 +00:00
media_repository.py	Update copyright notices	2015-01-06 13:21:39 +00:00
presence.py	Update copyright notices	2015-01-06 13:21:39 +00:00
profile.py	Update copyright notices	2015-01-06 13:21:39 +00:00
push_rule.py	Code style fixes.	2015-01-29 16:12:40 +00:00
pusher.py	Code style fixes.	2015-01-29 16:12:40 +00:00
registration.py	Extract the id token of the token when authing users, include the token and device_id in the internal meta data for the event along with the transaction id when sending events	2015-01-28 16:58:23 +00:00
rejections.py	Initial implementation of auth conflict resolution	2015-01-29 16:52:33 +00:00
room.py	Remove unused functions	2015-01-13 15:57:26 +00:00
roommember.py	Replace hs.parse_userid with UserID.from_string	2015-01-23 11:47:15 +00:00
signatures.py	Update copyright notices	2015-01-06 13:21:39 +00:00
state.py	Remove unused functions	2015-01-13 15:57:26 +00:00
stream.py	SYN-252: Supply the stream and topological parts in the correct order to the constructor	2015-01-29 01:48:48 +00:00
transactions.py	Add index on transaction_id to sent_transcations	2015-01-06 15:40:38 +00:00