forked-synapse/synapse/rest
Erik Johnston 347242a5c4 Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Conflicts:
	tests/rest/test_presence.py
	tests/rest/test_rooms.py
	tests/utils.py
2014-08-19 14:48:19 +01:00
..
__init__.py Make federation use resource_for_federation as well. 2014-08-14 10:05:06 +01:00
base.py Added a urls module for keeping client and federation prefixes. 2014-08-14 11:52:56 +01:00
directory.py Implement directory service federation by Federation Queries; avoid local_only hack; add unit tests 2014-08-13 18:03:41 +01:00
events.py Update the default longpoll timeout time. 2014-08-18 14:30:07 +01:00
im.py add in whitespace after copyright statements to improve legibility 2014-08-13 03:14:34 +01:00
login.py Pass back the user_id in the response to /login in case it has changed. Store and use that on the webclient rather than the input field. 2014-08-14 16:40:15 +01:00
presence.py add in whitespace after copyright statements to improve legibility 2014-08-13 03:14:34 +01:00
profile.py Now that HS->HS Profile lookups use Federation Queries, we don't need the 'local_only' antirecursion hack 2014-08-13 17:23:49 +01:00
public.py add in whitespace after copyright statements to improve legibility 2014-08-13 03:14:34 +01:00
register.py add in whitespace after copyright statements to improve legibility 2014-08-13 03:14:34 +01:00
room.py Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor 2014-08-19 14:48:19 +01:00