8029 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Erik Johnston	e178feca3f	Remove unused function	2017-01-13 15:16:45 +00:00
Erik Johnston	8b2fa38256	Split event auth code into seperate module	2017-01-13 15:07:32 +00:00
Erik Johnston	7e6c2937c3	Split out static auth methods from Auth object	2017-01-10 18:16:54 +00:00
Erik Johnston	8a0fddfd73	Remove spurious for..else..	2017-01-10 16:30:53 +00:00
Erik Johnston	d524bc9110	Merge pull request #1792 from matrix-org/erikj/limit_cache_prefill_device ... Limit number of entries to prefill from cache	2017-01-10 15:42:00 +00:00
Erik Johnston	d2b00d0866	Merge pull request #1790 from matrix-org/erikj/linearizer ... Add paranoia exception catch in Linearizer	2017-01-10 15:38:30 +00:00
Erik Johnston	dd52d4de4c	Limit number of entries to prefill from cache ... Some tables, like device_inbox, take a long time to query at startup for the stream change cache prefills. This is likely because they are slower growing streams and so are more fragmented on disk. For now, lets pull fewer entries out to make startup quicker. In future, we should add a better index to make it even faster.	2017-01-10 14:34:50 +00:00
Mark Haines	024eb98524	Merge pull request #1791 from matrix-org/markjh/file_logging ... Log which files we saved attachments to in the media_repository	2017-01-10 14:27:55 +00:00
Mark Haines	32019c9897	Log which files we saved attachments to in the media_repository	2017-01-10 14:19:50 +00:00
Erik Johnston	657488113e	Merge pull request #1789 from matrix-org/erikj/decouple_presence ... Don't block messages sending on bumping presence	2017-01-10 14:06:05 +00:00
Erik Johnston	3b4de17d2b	Comment	2017-01-10 14:05:53 +00:00
Erik Johnston	7d0981b312	Merge pull request #1787 from matrix-org/erikj/linearize_member ... Linearize updates to membership via PUT /state/	2017-01-10 14:04:54 +00:00
Erik Johnston	07c3c08fad	Merge pull request #1786 from matrix-org/erikj/linearizer_name ... Name linearizer's for better logs	2017-01-10 14:04:45 +00:00
Erik Johnston	f477370c0c	Add paranoia exception catch in Linearizer	2017-01-10 14:04:13 +00:00
Erik Johnston	586f474a44	Don't block messages sending on bumping presence	2017-01-10 12:46:00 +00:00
Erik Johnston	6823fe5241	Linearize updates to membership via PUT /state/	2017-01-09 18:25:13 +00:00
Erik Johnston	f7085ac84f	Name linearizer's for better logs	2017-01-09 17:17:10 +00:00
Erik Johnston	9898bbd9dc	Merge branch 'master' of github.com:matrix-org/synapse into develop	2017-01-09 14:51:17 +00:00
Erik Johnston	9a8ae6f1bf	Bump version and changelog	2017-01-09 14:47:56 +00:00
Matthew Hodgson	2f4b2f4783	gah, fix mangled merge of 0.18.7 into develop	2017-01-07 04:00:42 +00:00
Matthew	6d363cea9d	Merge branch 'release-v0.18.7' into develop	2017-01-07 03:46:16 +00:00
Matthew	f0e4bac64e	bump changelog & version	2017-01-07 03:45:38 +00:00
Matthew	4304e7e593	do the discard check in the right place to avoid grabbing dependent events	2017-01-07 03:44:18 +00:00
Matthew Hodgson	6515b9c0d4	changelog	2017-01-07 02:52:37 +00:00
Matthew Hodgson	8c48971b51	Merge branch 'release-v0.18.7' into develop	2017-01-07 02:23:37 +00:00
Matthew	e10c527930	Discard PDUs from invalid origins due to #1753 in 0.18.[56]	2017-01-07 02:13:14 +00:00
Matthew Hodgson	2f5be2d8dc	oops, this should have been rc1	2017-01-07 01:11:56 +00:00
Matthew Hodgson	4086026524	move logging to right place	2017-01-07 00:41:46 +00:00
Matthew Hodgson	9d914454c8	Merge branch 'release-v0.18.6' into develop	2017-01-07 00:40:30 +00:00
Matthew	19e2fb4386	bump version	2017-01-06 23:38:22 +00:00
Matthew	189fd15564	update changelog	2017-01-06 23:33:28 +00:00
Matthew	8404f132c3	Revert "fix typo breaking the fix to #1753" ... This reverts commit b2850e62db.	2017-01-06 23:28:46 +00:00
Matthew	b2850e62db	fix typo breaking the fix to #1753	2017-01-06 23:23:37 +00:00
Mark Haines	06c00bd19b	Merge branch 'release-v0.18.6' into develop	2017-01-06 14:46:27 +00:00
Mark Haines	b42a972b71	Bump version and changelog	2017-01-06 14:44:28 +00:00
Mark Haines	2c8ac84a26	Merge pull request #1772 from matrix-org/markjh/fix_guest_access_check ... handlers/room_member: fix guest access check when joining rooms	2017-01-06 14:41:52 +00:00
Patrik Oldsberg	1ef6084b75	handlers/room_member: fix guest access check when joining rooms ... Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>	2017-01-06 14:36:56 +00:00
Matthew Hodgson	bd85434cb3	Merge branch 'release-v0.18.6' into develop	2017-01-05 13:58:19 +00:00
Mark Haines	c18f7fc410	Fix flake8 and update changelog	2017-01-05 13:50:22 +00:00
Matthew Hodgson	dafd50d178	Merge pull request #1767 from matrix-org/matthew/resolve_state_group_logging ... log call paths for resolve_state_group	2017-01-05 13:47:42 +00:00
Matthew Hodgson	883ff92a7f	Fix case	2017-01-05 13:45:02 +00:00
Matthew Hodgson	d79d165761	add logging for all the places we call resolve_state_groups. my kingdom for a backtrace that actually works.	2017-01-05 13:40:39 +00:00
Matthew Hodgson	8cfc0165e9	fix annoying typos	2017-01-05 13:39:43 +00:00
Mark Haines	62451800e7	Bump version and changelog to v0.18.6-rc3	2017-01-05 13:36:10 +00:00
Matthew Hodgson	b31ed22738	Merge branch 'release-v0.18.6' into develop	2017-01-05 13:03:02 +00:00
Matthew Hodgson	7738329672	Merge pull request #1766 from matrix-org/markjh/linear_logging ... More logging for the linearizer and for get_events	2017-01-05 13:01:31 +00:00
Mark Haines	dd3df11c55	More logging for the linearizer and for get_events	2017-01-05 12:32:47 +00:00
Mark Haines	e1c5463efc	Merge pull request #1765 from matrix-org/markjh/timeout_get_missing_events ... cherrypick #1744: limit total timeout for get_missing_events to 10s	2017-01-05 12:02:23 +00:00
Matthew Hodgson	468749c9fc	fix comment	2017-01-05 12:00:11 +00:00
Matthew Hodgson	eedf400d05	limit total timeout for get_missing_events to 10s	2017-01-05 11:58:15 +00:00