Daniel Wagner-Hall e8cf77fa49 Merge branch 'develop' into refresh ... Conflicts: synapse/rest/client/v1/login.py		2015-08-20 16:25:40 +01:00
..
__init__.py	Add config option to turn off freezing events. Use new encode_json api and ujson.loads	2015-05-29 12:17:33 +01:00
admin.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
base.py	1) Pushers are now associated with an access token	2015-03-24 17:24:15 +00:00
directory.py	Merge pull request #50 from matrix-org/application-services	2015-02-13 15:06:14 +00:00
events.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
initial_sync.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
login.py	Merge branch 'develop' into refresh	2015-08-20 16:25:40 +01:00
presence.py	Blunty replace json with simplejson	2015-02-11 14:23:10 +00:00
profile.py	Blunty replace json with simplejson	2015-02-11 14:23:10 +00:00
push_rule.py	SYN-390: Don't modify the dictionary returned from the data store	2015-05-26 10:14:15 +01:00
pusher.py	Allow multiple pushers for a single app ID & pushkey, honouring the 'append' flag in the API.	2015-03-25 19:06:22 +00:00
register.py	Factor out user id validation checks	2015-03-18 11:34:18 +00:00
room.py	Remove semicolon.	2015-07-20 14:02:36 +01:00
transactions.py	Remove access_token from synapse.rest.client.v1.transactions {get,store}_response logging	2015-06-16 10:09:43 +01:00
voip.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