9285 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnston	629cdfb124	Use join rather than joined, etc.	2017-07-24 14:54:05 +01:00
Erik Johnston	ed666d3969	Fix all the typos	2017-07-24 14:05:09 +01:00
Erik Johnston	b76ef6ccb8	Include users membership in group in summary API	2017-07-24 13:55:39 +01:00
Erik Johnston	851aeae7c7	Check users/rooms are in group before adding to summary	2017-07-24 13:40:56 +01:00
Erik Johnston	d5e32c843f	Correctly add joins to correct segment	2017-07-24 13:31:26 +01:00
Erik Johnston	96917d5552	Merge pull request #2378 from matrix-org/erikj/group_sync_support ... Add groups to sync stream	2017-07-21 11:05:39 +01:00
Erik Johnston	0401604222	Merge pull request #2377 from matrix-org/erikj/group_profile_update ... Add update group profile API	2017-07-20 17:53:39 +01:00
Erik Johnston	b238cf7f6b	Remove spurious content param	2017-07-20 17:49:55 +01:00
Erik Johnston	960dae3340	Add notifier	2017-07-20 17:14:44 +01:00
Erik Johnston	2cc998fed8	Fix replication. And notify	2017-07-20 17:13:18 +01:00
Erik Johnston	139fe30f47	Remember to cast to bool	2017-07-20 16:47:35 +01:00
Erik Johnston	4d793626ff	Fix bug in generating current token	2017-07-20 16:42:44 +01:00
Erik Johnston	c544188ee3	Add groups to sync stream	2017-07-20 16:36:42 +01:00
Erik Johnston	0ab153d201	Check values are strings	2017-07-20 16:24:18 +01:00
Erik Johnston	8209b5f033	Fix a storage desc	2017-07-20 16:22:22 +01:00
Erik Johnston	b27429729d	Merge pull request #2375 from matrix-org/erikj/port_script ... Fix port script for user directory tables	2017-07-20 16:16:43 +01:00
Erik Johnston	60a9a49f83	Extend comment	2017-07-20 16:16:29 +01:00
Erik Johnston	b3bf6a1218	Merge pull request #2374 from matrix-org/erikj/group_server_local ... Add local group server support	2017-07-20 13:15:42 +01:00
Erik Johnston	57826d645b	Fix typo	2017-07-20 13:15:22 +01:00
Erik Johnston	d7d24750be	Fix port script for user directory tables	2017-07-20 10:47:01 +01:00
Erik Johnston	6f443a74cf	Add update group profile API	2017-07-20 09:46:33 +01:00
Erik Johnston	14a34f12d7	Comments	2017-07-18 17:28:42 +01:00
Erik Johnston	3431ec55dc	Comments	2017-07-18 17:23:50 +01:00
Erik Johnston	6027b1992f	Fix permissions	2017-07-18 16:51:25 +01:00
Erik Johnston	e884ff31d8	Add DELETE	2017-07-18 16:41:44 +01:00
Erik Johnston	05c13f6c22	Add 'args' param to post_json	2017-07-18 16:40:21 +01:00
Erik Johnston	94ecd871a0	Fix typos	2017-07-18 16:38:54 +01:00
Erik Johnston	12ed4ee48e	Correctly parse query params	2017-07-18 15:33:09 +01:00
Erik Johnston	332839f6ea	Update federation client pokes	2017-07-18 14:45:37 +01:00
Erik Johnston	e5ea6dd021	Add client apis	2017-07-18 14:37:06 +01:00
Erik Johnston	cccfcfa7b9	Comments	2017-07-18 10:35:18 +01:00
Erik Johnston	68f34e85ce	Use transport client directly	2017-07-18 10:29:57 +01:00
Erik Johnston	3e703eb04e	Comment	2017-07-18 10:17:25 +01:00
Erik Johnston	508460f240	Remove sync stuff	2017-07-18 09:55:46 +01:00
Erik Johnston	6e9f147faa	Add GroupID type	2017-07-18 09:47:25 +01:00
Erik Johnston	4540730111	Remove unused tables	2017-07-18 09:38:15 +01:00
Erik Johnston	e96ee95a7e	Remove sync stuff	2017-07-18 09:38:08 +01:00
Erik Johnston	2f9eafdd36	Add local group server support	2017-07-17 12:03:49 +01:00
Erik Johnston	b3de67234e	Merge pull request #2363 from matrix-org/erikj/group_server_summary ... Add group summary APIs	2017-07-17 11:54:14 +01:00
Erik Johnston	514c2d3c4d	Merge pull request #2371 from matrix-org/erikj/push_cache_hit ... Increase cache hit ratio for push	2017-07-17 09:42:27 +01:00
Erik Johnston	bfde076022	Increase cache hit ratio for push ... We don't update the cache in all code paths, which causes subsequent calls to miss the cache	2017-07-14 16:11:26 +01:00
Erik Johnston	cb3aee8219	Ensure category and role ids are non-null	2017-07-14 14:06:55 +01:00
Erik Johnston	85fda57208	Add DEFAULT_ROLE_ID	2017-07-14 14:03:54 +01:00
Erik Johnston	4b203bdba5	Correctly increment orders	2017-07-14 14:02:31 +01:00
Erik Johnston	d3862812ff	Merge pull request #2366 from matrix-org/erikj/push_metrics ... Add more metrics to push rule evaluation	2017-07-14 11:04:03 +01:00
Erik Johnston	8d26385d76	Add more metrics to push rule evaluation	2017-07-13 14:37:30 +01:00
Erik Johnston	3b0470dba5	Remove unused functions	2017-07-13 13:54:01 +01:00
Erik Johnston	8575e3160f	Comments	2017-07-13 13:52:41 +01:00
Erik Johnston	67b7b904ba	Merge pull request #2365 from matrix-org/erikj/push_skip_lock ... Push: Don't acquire lock unless necessary	2017-07-13 11:44:48 +01:00
Erik Johnston	f60218ec41	Push: Don't acquire lock unless necessary	2017-07-13 11:23:53 +01:00