14 Commits

Author	SHA1	Message	Date
Erik Johnston	78015948a7	Initial implementation of auth conflict resolution	2015-01-29 16:52:33 +00:00
Erik Johnston	38e3241eb7	Merge branch 'hotfixes-v0.6.1b' of github.com:matrix-org/synapse into develop	2015-01-13 10:01:22 +00:00
Erik Johnston	39585bf556	Insert 'age' into top level when returning events to clients	2015-01-13 09:57:32 +00:00
Kegan Dougal	edb557b2ad	Return the raw federation event rather than adding extra keys for federation data.	2015-01-08 14:28:08 +00:00
Kegan Dougal	5720ab59e0	Add 'raw' query parameter to expose the event graph and signatures to savvy clients.	2015-01-08 13:57:40 +00:00
Mark Haines	adb04b1e57	Update copyright notices	2015-01-06 13:21:39 +00:00
Mark Haines	5dbe820e9a	Remove unneeded federation keys from events	2014-12-19 12:16:26 +00:00
Erik Johnston	c8dd3314d6	Fix bug where we ignored event_edge_hashes table	2014-12-15 13:55:22 +00:00
Erik Johnston	9191292b0f	Fix prev_content	2014-12-11 15:16:55 +00:00
Erik Johnston	8cdebce470	Fix redactions. Fix 'age' key	2014-12-11 13:25:19 +00:00
Erik Johnston	8c48450682	Add PEP8 newlines	2014-12-09 10:58:31 +00:00
Erik Johnston	d044121168	Various typos and bug fixes.	2014-12-08 09:08:26 +00:00
Erik Johnston	6630e1b579	Start making more things use EventContext rather than event.*	2014-12-05 16:20:48 +00:00
Erik Johnston	75b4329aaa	WIP for new way of managing events.	2014-12-03 16:07:21 +00:00