Mark Haines
|
7acede1e42
|
Fix pyflakes warnings
|
2014-08-28 13:51:50 +01:00 |
|
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 |
|
Mark Haines
|
2aeaa7b77c
|
Merge branch 'develop' into storage_transactions
Conflicts:
synapse/handlers/room.py
synapse/storage/stream.py
|
2014-08-27 17:15:58 +01:00 |
|
Mark Haines
|
a03c7f27a8
|
Fill out prev_events before calling persist_event
|
2014-08-27 14:32:19 +01:00 |
|
Mark Haines
|
d2798de660
|
Fold federation/handler into handlers/federation
|
2014-08-26 19:49:42 +01:00 |
|
Mark Haines
|
a498df0428
|
Move new event boilerplate in room handlers into a method on a base clase.
|
2014-08-26 18:49:51 +01:00 |
|
Erik Johnston
|
1587ea26fe
|
Wait for getting a Join in response to an invite/join dance.
|
2014-08-21 14:38:22 +01:00 |
|
Matthew Hodgson
|
f98e6380f1
|
add in whitespace after copyright statements to improve legibility
|
2014-08-13 03:14:34 +01:00 |
|
matrix.org
|
4f475c7697
|
Reference Matrix Home Server
|
2014-08-12 15:10:52 +01:00 |