8133 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Erik Johnston	4c9812f5da	Merge pull request #1861 from matrix-org/erikj/device_list_fixes ... Device List fixes	2017-01-30 17:56:19 +00:00
Erik Johnston	1c13c9f6b6	Don't have such a large cache	2017-01-30 17:12:14 +00:00
Erik Johnston	c7a26b7c32	Fix unit tests	2017-01-30 17:11:24 +00:00
Erik Johnston	c2c9a78db9	Noop device key changes if they're the same	2017-01-30 16:55:04 +00:00
Erik Johnston	e75a779d9e	Fix query	2017-01-30 16:38:20 +00:00
Erik Johnston	828db669ec	Use get_users_in_room and declare it iterable	2017-01-30 16:37:22 +00:00
Erik Johnston	9636b2407d	Merge pull request #1857 from matrix-org/erikj/device_list_stream ... Implement device lists updates over federation	2017-01-30 14:35:21 +00:00
Erik Johnston	3670025e64	Rename func	2017-01-30 14:11:31 +00:00
Erik Johnston	4ac363a168	Remove debug logging	2017-01-30 14:10:12 +00:00
Erik Johnston	d360c97ae1	Clear out old destination pokes.	2017-01-30 10:14:37 +00:00
Erik Johnston	76100203ab	Always use the latest stream_id, sent or unsent	2017-01-30 10:14:25 +00:00
Erik Johnston	d1e1fd6210	Add ts column to device_lists_outbound_pokes	2017-01-27 15:23:48 +00:00
Erik Johnston	252b503fc8	Hook device list updates to replication	2017-01-27 14:31:35 +00:00
Erik Johnston	84a35f32c7	Comment	2017-01-27 10:35:12 +00:00
Erik Johnston	c517a19c2d	Comment	2017-01-27 10:33:26 +00:00
Erik Johnston	738a2867c8	SQL param ordering	2017-01-27 10:31:29 +00:00
Erik Johnston	755adff0e4	User if rather than for	2017-01-27 10:31:06 +00:00
Erik Johnston	888c59c955	Better name	2017-01-27 10:29:47 +00:00
Erik Johnston	f25a4a4692	Remove unused param	2017-01-27 10:27:39 +00:00
Erik Johnston	b3e1f2aa7a	Fix unit tests	2017-01-26 17:16:24 +00:00
Erik Johnston	31aca5589c	Fix on sqlite: use left rather than outer join	2017-01-26 16:55:50 +00:00
Erik Johnston	76d40f4904	Handle users leaving rooms	2017-01-26 16:39:33 +00:00
Erik Johnston	fbfad76c03	Add comments	2017-01-26 16:33:21 +00:00
Erik Johnston	c974116f19	Implement device key caching over federation	2017-01-26 16:07:24 +00:00
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	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