1972 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnston	fa4b610ae3	Fix stream test. Make sure we add join to auth_events for invitiations	2014-12-12 10:42:27 +00:00
Erik Johnston	cde840a82c	Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor ... Conflicts: setup.py	2014-12-11 17:48:48 +00:00
Erik Johnston	85574cfbf0	Merge pull request #23 from matrix-org/media_repository ... Media repository	2014-12-11 17:46:23 +00:00
Erik Johnston	3fecacd86b	Fix replication tests	2014-12-11 17:11:06 +00:00
Erik Johnston	d3eb12c7b8	Fix federation test	2014-12-11 17:01:27 +00:00
Mark Haines	03d9024cbc	Allow only one download for a given image at a time, so that we don't end up downloading the same image twice if two clients request a remote image at the same time	2014-12-11 16:48:11 +00:00
Erik Johnston	c161b6cf96	Fix room creation test	2014-12-11 16:43:30 +00:00
Erik Johnston	0b04369238	Fix public room joining by making sure replaces_state never points to itself.	2014-12-11 15:56:06 +00:00
Erik Johnston	9191292b0f	Fix prev_content	2014-12-11 15:16:55 +00:00
Mark Haines	d80d505b1f	Limit the size of images that are thumbnailed serverside. Limit the size of file that a server will download from a remote server	2014-12-11 14:19:32 +00:00
Erik Johnston	e72b16f9a3	Fix redaction tests	2014-12-11 13:38:52 +00:00
Erik Johnston	8cdebce470	Fix redactions. Fix 'age' key	2014-12-11 13:25:19 +00:00
Mark Haines	ead8fc5e38	doc the thumbnail methods	2014-12-11 10:41:43 +00:00
Mark Haines	b5eb9124f7	Make sure we pass a tuple to string '%' formatting	2014-12-11 10:08:09 +00:00
Paul "LeoNerd" Evans	4551afc6d2	Implement .cancel_call_later() in MockClock	2014-12-10 19:26:52 +00:00
Paul "LeoNerd" Evans	38da9884e7	Implement .call_later() in MockClock	2014-12-10 19:24:12 +00:00
Paul "LeoNerd" Evans	be9a8d68e0	Trivial test of MockClock()	2014-12-10 19:13:50 +00:00
Erik Johnston	4d6af0dde3	Fix some tests	2014-12-10 18:00:57 +00:00
Erik Johnston	4c682143c8	.from_string() no longer takes a HS	2014-12-10 18:00:49 +00:00
Erik Johnston	02e4c18171	Remove dead code	2014-12-10 18:00:36 +00:00
Erik Johnston	b245ee34ed	Add some basic event validation	2014-12-10 17:59:47 +00:00
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