2153 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Erik Johnston	88484f684f	Merge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse	2014-12-13 18:15:14 +00:00
Erik Johnston	eea58b8076	Bump version and change log	2014-12-13 18:04:37 +00:00
Erik Johnston	6380ead2ee	Fix bug while generating the error message when a file path specified in the config doesn't exist	2014-12-13 18:03:01 +00:00
Erik Johnston	23c7cb6220	Remove unused imports	2014-12-12 16:31:59 +00:00
Erik Johnston	fc409096ac	Make auth module use EventTypes constants	2014-12-12 16:31:50 +00:00
Erik Johnston	1fc2a0e33e	Fix tests and remove debug logging	2014-12-12 15:08:29 +00:00
Erik Johnston	7b43a503f3	Consistently url decode and decode as utf 8 the URL parts	2014-12-12 15:05:37 +00:00
Erik Johnston	c39beb5559	Store json as UTF-8 and not bytes	2014-12-12 14:53:37 +00:00
Erik Johnston	75085bb4d1	Pyflakes	2014-12-12 14:34:34 +00:00
Erik Johnston	ebf2ec3ce6	Fix membership handler test	2014-12-12 14:32:44 +00:00
Erik Johnston	41ff21c907	Fix test.	2014-12-12 14:10:32 +00:00
Paul "LeoNerd" Evans	b0bb1756a9	Send list of typing user IDs as 'user_ids' list within 'content', so that m.typing stream events have a toplevel content, for consistency with others	2014-12-12 11:59:46 +00:00
Erik Johnston	63810c777d	Validate message, topic and name event contents	2014-12-12 11:01:09 +00:00
Erik Johnston	fa4b610ae3	Fix stream test. Make sure we add join to auth_events for invitiations	2014-12-12 10:42:27 +00:00
Paul "LeoNerd" Evans	0b70023373	Merge branch 'develop' into typing_notifications	2014-12-11 18:35:05 +00:00
Paul "LeoNerd" Evans	57b5094545	Merge branch 'develop' of github.com:matrix-org/synapse into develop	2014-12-11 18:34:26 +00:00
Paul "LeoNerd" Evans	3e84896481	Merge remote-tracking branch 'origin' into typing_notifications	2014-12-11 18:33:29 +00:00
Paul "LeoNerd" Evans	cfb963af03	When users leave rooms mark them as no longer typing in them	2014-12-11 18:33:09 +00:00
Paul "LeoNerd" Evans	f25764943c	Add a 'user_left_room' distributor signal analogous to 'user_joined_room'	2014-12-11 18:27:01 +00:00
Mark Haines	b3e34a5399	Fix typo in media repository doc string	2014-12-11 18:21:08 +00:00
Mark Haines	64bf9f54cc	Fix media repository doc string to include server_name	2014-12-11 18:18:58 +00:00
Paul "LeoNerd" Evans	5ebc994f84	Actually auth-check to ensure people can only send typing notifications for rooms they're actually in	2014-12-11 18:11:43 +00:00
Paul "LeoNerd" Evans	966c4b2b04	Add a sprinkling of logger.debug() into typing notification handler	2014-12-11 18:00:15 +00:00
Paul "LeoNerd" Evans	6e1531682b	Move typing-notification REST tests into their own .py file	2014-12-11 17:54:42 +00:00
Paul "LeoNerd" Evans	1f26e56de0	Actually unit-test the event stream around REST typing tests	2014-12-11 17:54:42 +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
Paul "LeoNerd" Evans	3b2cc26053	Initial hack at unit tests of room typing REST API	2014-12-11 16:03:12 +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
Paul "LeoNerd" Evans	0ca072b3b6	Initial tiny hack at REST API for setting room typing notification status	2014-12-11 10:55:36 +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	5f49914dee	Avoid cyclic dependency in handler setup	2014-12-10 21:17:48 +00:00
Paul "LeoNerd" Evans	1a75ff5c23	Hook up the event stream to typing notifications	2014-12-10 21:01:49 +00:00
Paul "LeoNerd" Evans	4006d58335	Store serial numbers per room for typing event stream purposes	2014-12-10 20:48:25 +00:00
Paul "LeoNerd" Evans	9eb819e828	First hack at implementing timeouts in typing notification handler	2014-12-10 19:39:01 +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