2102 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Mark Haines	4f37c0ea9d	Merge branch 'develop' into media_repository	2014-12-10 16:55:06 +00:00
Mark Haines	7f193b9958	update media repository implementation docs	2014-12-10 16:54:37 +00:00
Mark Haines	61fc37e467	Merge branch 'develop' into media_repository	2014-12-10 16:14:17 +00:00
Erik Johnston	6a8148f15b	Add new event graphing tool	2014-12-10 16:10:25 +00:00
Mark Haines	2d265ef3bd	import Image as PIL.Image.	2014-12-10 16:09:18 +00:00
Erik Johnston	1d2a0040cf	Fix bug where we clobbered old state group values	2014-12-10 15:55:03 +00:00
Mark Haines	e5275d856e	Get the code actually working	2014-12-10 15:46:18 +00:00
Mark Haines	cc84d3ea78	Thumbnail uploaded and cached images	2014-12-10 15:40:52 +00:00
Erik Johnston	cabead6194	Actually fix bug when uploading state with empty state_key	2014-12-10 14:49:52 +00:00
Erik Johnston	02db7eb209	Fix bug when uploading state with empty state_key	2014-12-10 14:02:48 +00:00
Matthew Hodgson	8ffbb52eee	oops	2014-12-10 13:43:34 +00:00
Erik Johnston	aae8a37e63	Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor	2014-12-10 13:18:40 +00:00
Matthew Hodgson	32bc2b4fc1	update codestyle based on debate on #matrix-dev	2014-12-10 13:11:43 +00:00
Erik Johnston	02db1fd2e7	Fix AttributeError	2014-12-10 12:00:05 +00:00
Erik Johnston	018443cb59	Make depth increase.	2014-12-10 11:59:53 +00:00
Erik Johnston	102d2373b4	Add __str__ to FrozenEvent	2014-12-10 11:38:08 +00:00
Erik Johnston	95aa903ffa	Try and figure out how and why signatures are being changed.	2014-12-10 11:37:47 +00:00
Erik Johnston	6497caee7c	Merge pull request #22 from matrix-org/federation_retries ... Federation retries	2014-12-10 10:35:57 +00:00
Matthew Hodgson	0f4dcab238	turn back on per-request transaction retries, so that every time we try to hit a dead server we actually end up hammering 5 times :|	2014-12-10 10:28:27 +00:00
Erik Johnston	08aceea82e	Add newline back in	2014-12-10 10:26:12 +00:00
Erik Johnston	f26ec14b21	Remove whitespace	2014-12-10 10:25:21 +00:00
Erik Johnston	b8d30899b1	Code style.	2014-12-10 10:16:09 +00:00
Matthew Hodgson	71da2bed55	plateau retries after 1h	2014-12-10 00:18:44 +00:00
Matthew Hodgson	faf12b64f8	add errbacks to enqueue_pdu deferreds; change logging for failed federation sends to warn rather than exception	2014-12-10 00:12:51 +00:00
Matthew Hodgson	2b1acb7671	squidge to 79 columns as per pep8	2014-12-10 00:03:55 +00:00
Matthew Hodgson	8ada2d2018	fix UTs by telling all the mock stores about the new methods for tracking retries	2014-12-09 23:53:07 +00:00
Erik Johnston	b63cea9660	This is to test jenkins	2014-12-09 16:35:00 +00:00
Erik Johnston	26e293abbe	This is to test jenkins	2014-12-09 16:33:47 +00:00
Erik Johnston	50fd5014c2	This is to test jenkins	2014-12-09 16:33:04 +00:00
Erik Johnston	7e8d5c2606	This is to test jenkins	2014-12-09 16:31:27 +00:00
Erik Johnston	d45c030652	Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor	2014-12-09 14:53:30 +00:00
Erik Johnston	008303b245	PEP8	2014-12-09 14:49:11 +00:00
Erik Johnston	5eca288d28	Fix joining from an invite	2014-12-09 14:47:27 +00:00
Erik Johnston	aa3f66cf7f	Change the way we implement get_events to be less sucky	2014-12-09 13:35:26 +00:00
Erik Johnston	90d022441f	Delete test file	2014-12-09 13:14:38 +00:00
Erik Johnston	d7277398b9	This is to test jenkins	2014-12-09 12:20:49 +00:00
Erik Johnston	4a7a0ed949	This is to test jenkins	2014-12-09 11:41:32 +00:00
Erik Johnston	bdbcd8a638	This is to test jenkins	2014-12-09 11:36:38 +00:00
Erik Johnston	3654825b02	This is to test jenkins	2014-12-09 11:25:41 +00:00
Erik Johnston	2ef499ab84	This is to test jenkins	2014-12-09 11:19:39 +00:00
Erik Johnston	3986c775c4	This is to test jenkins	2014-12-09 11:16:03 +00:00
Erik Johnston	bc6564bac0	Add PEP8 newlines	2014-12-09 11:01:44 +00:00
Erik Johnston	8c48450682	Add PEP8 newlines	2014-12-09 10:58:31 +00:00
Erik Johnston	1c8ee06877	Remove unused snapshot	2014-12-09 10:53:34 +00:00
Erik Johnston	4e57943cc5	Remove unused import	2014-12-09 10:51:36 +00:00
Matthew Hodgson	c46ce4fca2	Merge branch 'develop' into federation_retries	2014-12-08 19:37:07 +00:00
Matthew Hodgson	8529fba02d	fix a million stupid bugs and make it actually work	2014-12-08 19:34:51 +00:00
Erik Johnston	609c31e8df	More bug fixes	2014-12-08 17:50:56 +00:00
Matthew Hodgson	0d3fa1ac6e	add a write-through cache on the retry schedule	2014-12-08 17:48:57 +00:00
Erik Johnston	ee3df06183	More bug fixes	2014-12-08 14:50:48 +00:00