Mark Haines 396a67a09a Merge branch 'client_v2_filter' into client_v2_sync ... Conflicts: synapse/rest/client/v2_alpha/__init__.py		2015-01-29 14:58:00 +00:00
..
schema	Merge changes from develop	2015-01-29 14:55:27 +00:00
__init__.py	Merge changes from develop	2015-01-29 14:55:27 +00:00
_base.py	unnecessary newlines	2015-01-28 14:48:42 +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	s/definition/filter_json/ since definition is now used to mean a component of the filter, rather than the complete json	2015-01-28 17:42:19 +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	Allow the push rule delete method to take more specifiers.	2015-01-28 18:06:04 +00:00
pusher.py	add instance_handles to pushers so we have a way to refer to them even if the push token changes.	2015-01-20 11:49:48 +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
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	Merge branch 'client_v2_filter' into client_v2_sync	2015-01-29 14:58:00 +00:00
transactions.py	Add index on transaction_id to sent_transcations	2015-01-06 15:40:38 +00:00