9110 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Paul Evans	e978247fe5	Merge pull request #1852 from matrix-org/paul/issue-1382 ... Don't clobber a displayname or avatar_url if provided by an m.room.member event	2017-01-25 18:15:19 +00:00
Erik Johnston	51e9fe36e4	Fix up sending of m.device_list_update edus	2017-01-25 16:55:21 +00:00
Erik Johnston	2367c5568c	Add basic implementation of local device list changes	2017-01-25 14:27:27 +00:00
Paul "LeoNerd" Evans	10e48d8310	Don't clobber a displayname or avatar_url if provided by an m.room.member event	2017-01-24 18:06:07 +00:00
Erik Johnston	ba8e144554	Merge branch 'erikj/current_state_fix' into develop	2017-01-23 16:15:10 +00:00
Erik Johnston	f5b46482f4	Merge pull request #1840 from matrix-org/erikj/current_state_fix ... Insert delta of current_state_events to be more efficient	2017-01-23 16:14:34 +00:00
Erik Johnston	fdf2a31a51	Typo	2017-01-23 16:14:14 +00:00
Erik Johnston	41dab8a222	Fix bug where current_state_events renamed to current_state_ids	2017-01-23 15:22:48 +00:00
Erik Johnston	c77b24c092	Refactor to calculate state delta outside transaction	2017-01-23 14:51:33 +00:00
Erik Johnston	5d2134d485	Comments	2017-01-20 17:13:24 +00:00
Erik Johnston	a55fa2047f	Insert delta of current_state_events to be more efficient	2017-01-20 17:10:18 +00:00
Erik Johnston	3d9d48fffb	Merge pull request #1836 from matrix-org/erikj/current_state_fix ... Derive current_state_events from state groups	2017-01-20 15:14:05 +00:00
Richard van der Hoff	a0d03f2e15	Merge pull request #1837 from matrix-org/rav/fix_purge_media_doc ... fix doc for purge_media_cache	2017-01-20 15:12:34 +00:00
Erik Johnston	d0897dead5	Spelling	2017-01-20 15:05:11 +00:00
Erik Johnston	567aa35b67	Update all call sites after rename	2017-01-20 14:40:31 +00:00
Erik Johnston	f2f40e64a9	Comments	2017-01-20 14:38:13 +00:00
Erik Johnston	4c6a31cd6e	Calculate the forward extremeties once	2017-01-20 14:28:53 +00:00
Richard van der Hoff	83333498a5	fix doc for purge_media_cache ... purge_media_cache takes its arg from a query-param, not the POST body, for some reason.	2017-01-20 12:15:50 +00:00
Erik Johnston	86063d4321	Merge pull request #1835 from matrix-org/erikj/fix_workers ... Make worker listener config backwards compat	2017-01-20 11:55:56 +00:00
Erik Johnston	09eb08f910	Derive current_state_events from state groups	2017-01-20 11:52:51 +00:00
Erik Johnston	97efe99ae9	Make worker listener config backwards compat	2017-01-20 11:45:29 +00:00
David Baker	691c8198b7	Merge pull request #1832 from xsteadfastx/xsteadfastx/turn-username-password ... Added username and password for turn server	2017-01-19 14:28:31 +00:00
Marvin Steadfast	86e6165687	Added default config for turn username and password	2017-01-19 14:35:55 +01:00
Marvin Steadfast	1e38be3a7a	Added username and password for turn server ... It makes it possible to use a turn server that needs a username and password instead of a token.	2017-01-19 14:08:20 +01:00
Erik Johnston	841c228533	Merge pull request #1828 from matrix-org/erikj/iterable_cache_size ... Update LruCache size estimate on clear	2017-01-18 14:57:54 +00:00
Erik Johnston	c430111d0e	Update LruCache size estimate on clear	2017-01-18 14:55:23 +00:00
David Baker	97d3918377	Merge pull request #1811 from aperezdc/unhardcode-riot-urls ... Allow configuring the Riot URL used in notification emails	2017-01-18 14:38:49 +00:00
David Baker	6f6bf2a1eb	Merge pull request #1827 from matrix-org/dbkr/email_case_insensitive ... Lowercase all email addresses before querying db	2017-01-18 13:39:47 +00:00
David Baker	8c5009b628	Lowercase all email addresses before querying db ... Since we store all emails in the DB in lowercase (https://github.com/matrix-org/synapse/pull/1170)	2017-01-18 13:25:56 +00:00
Erik Johnston	ae7b4da4cc	Merge pull request #1823 from matrix-org/erikj/load_events_logs ... Remove loading events logs	2017-01-18 11:07:58 +00:00
Erik Johnston	fc7cae8aa3	Merge pull request #1824 from matrix-org/erikj/retry_host_log ... Lower the not retrying host log line to debug	2017-01-18 11:07:51 +00:00
Erik Johnston	f9058ca785	Merge pull request #1822 from matrix-org/erikj/statE_logging ... Change resolve_state_groups call site logging to DEBUG	2017-01-18 11:02:03 +00:00
Erik Johnston	f648313f98	Merge pull request #1821 from matrix-org/erikj/cache_metrics_string_intern ... Measure metrics of string_cache	2017-01-18 10:57:39 +00:00
Erik Johnston	15f012032c	Merge pull request #1818 from matrix-org/erikj/state_auth_splitout_split ... Optimise state resolution	2017-01-18 10:53:00 +00:00
Erik Johnston	4ec1cf49e2	Lower loading events log to DEBUG	2017-01-17 17:28:32 +00:00
Erik Johnston	f878f64f43	Lower the not retrying host log line to debug	2017-01-17 17:20:39 +00:00
Erik Johnston	5f027d1fc5	Change resolve_state_groups call site logging to DEBUG	2017-01-17 17:07:15 +00:00
Erik Johnston	380dba1020	Measure metrics of string_cache	2017-01-17 17:04:46 +00:00
Erik Johnston	ed4d176152	PEP8	2017-01-17 15:27:28 +00:00
Mark Haines	c6064a7ba6	Only construct sets when necessary	2017-01-17 15:23:07 +00:00
Erik Johnston	a8594fd19f	Use better names	2017-01-17 14:59:03 +00:00
Erik Johnston	7fae460402	Merge pull request #1820 from matrix-org/erikj/push_tools ... Get state at event rather than for room in push	2017-01-17 14:58:26 +00:00
Erik Johnston	37b4c7d8a9	Fix typo in return type	2017-01-17 14:43:32 +00:00
Erik Johnston	e5d2df9c34	Use better variable name	2017-01-17 14:32:53 +00:00
Erik Johnston	04006bb7f0	Get state at event rather than for room in push	2017-01-17 14:31:21 +00:00
Erik Johnston	ce59a2faad	Correctly handle case of rejected events in state res	2017-01-17 14:18:53 +00:00
Erik Johnston	633f97151c	Check event is in state_map	2017-01-17 13:33:54 +00:00
Erik Johnston	e6153e1bd1	Fix couple of federation state bugs	2017-01-17 13:22:34 +00:00
Erik Johnston	5d6bad1b3c	Optimise state resolution	2017-01-17 13:22:19 +00:00
Erik Johnston	e8ecbb6f20	Merge pull request #1812 from matrix-org/erikj/state_auth_splitout_split ... Split out static state methods from StateHandler	2017-01-17 11:55:18 +00:00