Kegan Dougal c059c9fea5 Merge branch 'develop' into application-services ... Conflicts: synapse/handlers/__init__.py synapse/storage/__init__.py		2015-02-02 15:57:59 +00:00
..
schema	Merge branch 'develop' into application-services	2015-02-02 15:57:59 +00:00
__init__.py	Merge branch 'develop' into application-services	2015-02-02 15:57:59 +00:00
_base.py	Be more specific in naming columns in selects.	2015-01-30 14:48:11 +00:00
appservice.py	Add basic application_services SQL, and hook up parts of the appservice store to read from it.	2015-01-28 11:59:38 +00:00
directory.py	…
event_federation.py	…
feedback.py	…
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	…
media_repository.py	…
presence.py	…
profile.py	…
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	…
roommember.py	Replace hs.parse_userid with UserID.from_string	2015-01-23 11:47:15 +00:00
signatures.py	…
state.py	…
stream.py	Fix token formatting	2015-01-30 11:42:09 +00:00
transactions.py	…