716 Commits

Author	SHA1	Message	Date
Mark Haines	15ab5f5ad8	Merge backfill_ and backfill in federation handler	2014-08-28 13:45:35 +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	b30358f439	add _get_room_member, fix datastore methods	2014-08-27 16:51:54 +01:00
Erik Johnston	8af5e360d6	Remove store_id from notifier.on_new_room_event calls.	2014-08-27 16:23:33 +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	a29d12a18a	Use state_key rather than target_user_id	2014-08-26 16:13:32 +01:00
Mark Haines	ac21dfff6d	Fix pyflakes errors	2014-08-26 16:02:59 +01:00
Kegan Dougal	47c3a089c5	Merge branch 'develop' of github.com:matrix-org/synapse into client_server_url_rename	2014-08-26 09:26:33 +01:00
Kegan Dougal	cab3095803	Removed member list servlet: now using generic state paths.	2014-08-26 09:26:07 +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
Erik Johnston	5ef0948eaa	Better handle the edge cases of trying to remote join rooms	2014-08-20 14:42:47 +01:00
Erik Johnston	234128586b	Print out stacktrace when we failed to persist event.	2014-08-19 14:30:28 +01:00
Erik Johnston	75b6d982a0	Add a 'backfill room' button	2014-08-19 14:20:03 +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