Mark Haines 357dd1871d Merge branch 'develop' into storage_transactions ...

Conflicts:
	tests/handlers/test_federation.py
	tests/handlers/test_room.py

2014-08-27 17:28:55 +01:00

..

__init__.py

Initial typing notification support - EDU federation, but no timers, and no actual push to clients

2014-08-27 11:45:16 +01:00

_base.py

Merge branch 'develop' into storage_transactions

2014-08-27 17:28:55 +01:00

directory.py

Added a urls module for keeping client and federation prefixes.

2014-08-14 11:52:56 +01:00

events.py

PEP8 tweaks.

2014-08-27 14:19:39 +01:00

federation.py

Merge branch 'develop' into storage_transactions

2014-08-27 17:15:58 +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

Turn off presence again.

2014-08-27 16:09:48 +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

register.py

add in whitespace after copyright statements to improve legibility

2014-08-13 03:14:34 +01:00

room.py

Merge branch 'develop' into storage_transactions

2014-08-27 17:15:58 +01:00

typing.py

Initial typing notification support - EDU federation, but no timers, and no actual push to clients

2014-08-27 11:45:16 +01:00