2127 Commits

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	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	2cc998fed8	Fix replication. And notify	2017-07-20 17:13:18 +01:00
Erik Johnston	c544188ee3	Add groups to sync stream	2017-07-20 16:36:42 +01:00
Erik Johnston	8209b5f033	Fix a storage desc	2017-07-20 16:22:22 +01:00
Erik Johnston	57826d645b	Fix typo	2017-07-20 13:15:22 +01:00
Erik Johnston	6f443a74cf	Add update group profile API	2017-07-20 09:46:33 +01:00
Erik Johnston	94ecd871a0	Fix typos	2017-07-18 16:38:54 +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	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	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	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	26451a09eb	Comments	2017-07-12 14:47:18 +01:00
Erik Johnston	a62406aaa5	Add group summary APIs	2017-07-12 11:36:15 +01:00
Erik Johnston	6d586dc05c	Comment	2017-07-12 09:58:37 +01:00
Erik Johnston	410b4e14a1	Move comment	2017-07-11 15:44:18 +01:00
Erik Johnston	e52c391cd4	Rename column to attestation_json	2017-07-11 14:25:46 +01:00
Erik Johnston	0aac30d53b	Comments	2017-07-11 14:23:50 +01:00
Erik Johnston	83936293eb	Comments	2017-07-11 11:42:25 +01:00
Erik Johnston	b8ca494ee9	Initial group server implementation	2017-07-10 15:44:15 +01:00
Erik Johnston	f502b0dea1	Perf: Don't filter events for push ... We know the users are joined and we can explicitly check for if they are ignoring the user, so lets do that.	2017-07-07 14:04:40 +01:00
Erik Johnston	ed9a7f5436	Merge pull request #2309 from matrix-org/erikj/user_ip_repl ... Fix up user_ip replication commands	2017-07-06 14:33:14 +01:00
Erik Johnston	b5e8d529e6	Define CACHE_SIZE_FACTOR once	2017-07-04 09:56:44 +01:00
Erik Johnston	6ff14ddd2e	Make into list	2017-06-29 15:47:37 +01:00
Erik Johnston	5946aa0877	Prefill forward extrems and event to state groups	2017-06-29 15:38:48 +01:00
Erik Johnston	8c23221666	Fix up	2017-06-27 15:53:45 +01:00
Erik Johnston	a0a561ae85	Fix up client ips to read from pending data	2017-06-27 14:46:12 +01:00
Erik Johnston	ed3d0170d9	Batch upsert user ips	2017-06-27 13:37:04 +01:00
Erik Johnston	8abdd7b553	Fix up indices for users_who_share_rooms	2017-06-26 14:01:30 +01:00
Erik Johnston	7fe8ed1787	Store URL cache preview downloads seperately ... This makes it easier to clear old media out at a later date	2017-06-23 11:14:11 +01:00
Erik Johnston	e0004aa28a	Add desc	2017-06-22 10:03:48 +01:00
Erik Johnston	b668112320	Merge pull request #2296 from matrix-org/erikj/dont_appserver_shar ... Don't work out users who share room with appservice users	2017-06-21 14:50:24 +01:00
Erik Johnston	dae9a00a28	Initialise exclusive_user_regex	2017-06-21 14:19:33 +01:00
Krombel	4202fba82a	Merge branch 'develop' into avoid_duplicate_filters	2017-06-21 14:48:21 +02:00
Krombel	812c030e87	replaced json.dumps with encode_canonical_json	2017-06-21 14:48:12 +02:00
Erik Johnston	385dcb7c60	Handle thumbnail urls	2017-06-19 17:48:28 +01:00
Erik Johnston	b8b936a6ea	Add API to quarantine media	2017-06-19 17:39:21 +01:00
Erik Johnston	d7fe6b356c	Add shutdown room API	2017-06-19 12:37:27 +01:00
Erik Johnston	dfeca6cf40	Merge pull request #2286 from matrix-org/erikj/split_out_user_dir ... Split out user directory to a separate process	2017-06-16 13:01:19 +01:00
Erik Johnston	6aa5bc8635	Initial worker impl	2017-06-16 11:47:11 +01:00
Erik Johnston	d8f47d2efa	Merge pull request #2280 from matrix-org/erikj/share_room_user_dir ... Include users who you share a room with in user directory	2017-06-16 11:06:00 +01:00