Erik Johnston 2ebf795c0a Merge branch 'develop' of github.com:matrix-org/synapse into rejections ... Conflicts: synapse/storage/__init__.py synapse/storage/schema/delta/v12.sql		2015-01-30 11:10:37 +00:00
..
__init__.py	Update copyright notices	2015-01-06 13:21:39 +00:00
_base.py	Replace hs.parse_userid with UserID.from_string	2015-01-23 11:47:15 +00:00
admin.py	Update copyright notices	2015-01-06 13:21:39 +00:00
directory.py	Replace hs.parse_roomalias with RoomAlias.from_string	2015-01-23 13:21:58 +00:00
events.py	Merge branch 'develop' into pushers	2015-01-28 12:51:05 +00:00
federation.py	Update the current state of an event if we update auth events.	2015-01-30 11:08:52 +00:00
login.py	Update copyright notices	2015-01-06 13:21:39 +00:00
message.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
presence.py	Merge branch 'develop' into pushers	2015-01-28 12:51:05 +00:00
profile.py	Replace hs.parse_userid with UserID.from_string	2015-01-23 11:47:15 +00:00
register.py	Add matrix.org as a trusted ID server because it's now passed through on ports 80/443 and the web client defaults to that now. Fixes email validation (including signing up with an email address).	2015-01-28 10:09:54 +00:00
room.py	Pass the current time to serialize event, rather than passing an	2015-01-26 16:11:28 +00:00
typing.py	Replace hs.parse_userid with UserID.from_string	2015-01-23 11:47:15 +00:00