20333 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Erik Johnston	ba3d1e2fc0	Remove unused import	2014-12-08 12:01:25 +00:00
Erik Johnston	617dde2ba9	Ignore pycharm dir	2014-12-08 10:18:50 +00:00
Erik Johnston	e8323b9e34	More bug fixes	2014-12-08 10:16:18 +00:00
Erik Johnston	a295a3c691	Fix registration	2014-12-08 09:24:37 +00:00
Erik Johnston	d45f28f8bd	Ignore pycharm dir	2014-12-08 09:24:08 +00:00
Erik Johnston	721482c83e	Add forgotten file	2014-12-08 09:10:12 +00:00
Erik Johnston	d044121168	Various typos and bug fixes.	2014-12-08 09:08:26 +00:00
Matthew Hodgson	9c43b258ec	actually reset retry schedule if we can successfuly talk to it	2014-12-08 00:17:12 +00:00
Matthew Hodgson	5cd43d4b9f	fix stupid syntax thinkos	2014-12-07 23:44:16 +00:00
Matthew Hodgson	aed62a3583	track replication destination health, and perform exponential back-off when sending transactions. does *not* yet retry transactions, but drops them on the floor if waiting for a server to recover.	2014-12-07 02:26:07 +00:00
Mark Haines	63b0b946be	point the entry_point for synapse-homeserver at the right method	2014-12-05 18:01:05 +00:00
Mark Haines	a953be097f	Add a method field to thumbnail storage	2014-12-05 16:31:56 +00:00
Mark Haines	05e48c5d4b	Add pillow to dependencies	2014-12-05 16:29:36 +00:00
Erik Johnston	6630e1b579	Start making more things use EventContext rather than event.*	2014-12-05 16:20:48 +00:00
Mark Haines	0363820122	Add a class for generating thumbnails using PIL	2014-12-05 16:12:37 +00:00
Erik Johnston	ce212eb83a	Pull in latest matrix-angular_sdk	2014-12-05 11:55:24 +00:00
Erik Johnston	1c72e22c4f	Pull in latest matrix-angular_sdk	2014-12-05 11:21:56 +00:00
Erik Johnston	c5c32266d8	Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor	2014-12-04 15:58:24 +00:00
Erik Johnston	c31dba86ec	Convert rest and handlers to use new event structure	2014-12-04 15:50:01 +00:00
Mark Haines	c01fd5573c	Implement download support for media_repository	2014-12-04 14:22:31 +00:00
Erik Johnston	5d7c9ab789	Begin converting things to use the new Event structure	2014-12-04 11:27:59 +00:00
Paul "LeoNerd" Evans	f5d2514fc0	@log_function on PresenceStream's get_new_events_for_user()	2014-12-03 19:48:14 +00:00
Paul "LeoNerd" Evans	52f1d3c886	Store any incoming presence push in the local cache anyway, even if there's no interested observers (yet *hint*) (SYN-115)	2014-12-03 19:06:24 +00:00
Erik Johnston	370cd9011e	Merge branch 'release-v0.5.4' of github.com:matrix-org/synapse into develop	2014-12-03 18:03:42 +00:00
Erik Johnston	036516d647	Merge branch 'release-v0.5.4' of github.com:matrix-org/synapse v0.5.4	2014-12-03 18:02:33 +00:00
Erik Johnston	797193283e	Bump changes and version	2014-12-03 18:01:47 +00:00
Erik Johnston	75b4329aaa	WIP for new way of managing events.	2014-12-03 16:07:21 +00:00
David Baker	88af58d41d	Update to app_id / app_instance_id (partially) and mangle to be PEP8 compliant.	2014-12-03 13:37:02 +00:00