Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								2dce6b15c3
								
							
								
							
						 | 
						
							
							
								
								Fix typo
							
							
							
							
							
						 | 
						
							2017-11-09 15:56:16 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								e8814410ef
								
							
								
							
						 | 
						
							
							
								
								Have an explicit API to update room config
							
							
							
							
							
						 | 
						
							2017-11-08 16:13:27 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
								
								
							
							
								
							
								94ff2cda73
								
									
								
							
								
							
						 | 
						
							
							
								
								Revert "Modify group room association API to allow modification of is_public"
							
							
							
							
							
						 | 
						
							2017-11-08 15:43:34 +00:00 | 
						
					
				
					
						
							
							
								 
								Luke Barnard
							
						 | 
						
							
							
							
							
								
							
								38b265cb51
								
							
								
							
						 | 
						
							
							
								
								Remember to pick is_admin out of the db
							
							
							
							
							
						 | 
						
							2017-11-07 11:24:04 +00:00 | 
						
					
				
					
						
							
							
								 
								Luke Barnard
							
						 | 
						
							
							
							
							
								
							
								318a249c8b
								
							
								
							
						 | 
						
							
							
								
								Leave `is_public` as required argument of update_room_group_association
							
							
							
							
							
						 | 
						
							2017-11-01 09:36:01 +00:00 | 
						
					
				
					
						
							
							
								 
								Luke Barnard
							
						 | 
						
							
							
							
							
								
							
								20fe347906
								
							
								
							
						 | 
						
							
							
								
								Modify group room association API to allow modification of is_public
							
							
							
							
							
							
							
							also includes renamings to make things more consistent. 
							
						 | 
						
							2017-10-31 17:04:28 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								4ab8abbc2b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'erikj/attestation_local_fix' of github.com:matrix-org/synapse into develop
							
							
							
							
							
						 | 
						
							2017-10-27 15:07:08 +01:00 | 
						
					
				
					
						
							
							
								 
								Luke Barnard
							
						 | 
						
							
							
							
							
								
							
								5451cc7792
								
							
								
							
						 | 
						
							
							
								
								Request is_public from database
							
							
							
							
							
						 | 
						
							2017-10-27 11:27:43 +01:00 | 
						
					
				
					
						
							
							
								 
								Luke Barnard
							
						 | 
						
							
							
							
							
								
							
								6362298fa5
								
							
								
							
						 | 
						
							
							
								
								Create groups with is_public = True
							
							
							
							
							
						 | 
						
							2017-10-27 11:04:20 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								82d8c1bacb
								
							
								
							
						 | 
						
							
							
								
								Fixup
							
							
							
							
							
						 | 
						
							2017-10-27 10:30:21 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								195abfe7a5
								
							
								
							
						 | 
						
							
							
								
								Remove incorrect attestations
							
							
							
							
							
						 | 
						
							2017-10-27 09:58:13 +01:00 | 
						
					
				
					
						
							
							
								 
								Luke Barnard
							
						 | 
						
							
							
							
							
								
							
								2c5972f87f
								
							
								
							
						 | 
						
							
							
								
								Implement GET /groups/$groupId/invited_users
							
							
							
							
							
						 | 
						
							2017-10-16 15:31:11 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								818b08d0e4
								
							
								
							
						 | 
						
							
							
								
								peeeeeeeeep8888888888888888888888888888
							
							
							
							
							
						 | 
						
							2017-10-11 15:54:00 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								ea18996f54
								
							
								
							
						 | 
						
							
							
								
								Fix group stream replication
							
							
							
							
							
							
							
							The stream update functions expect the storage function to return a list
of tuples. 
							
						 | 
						
							2017-10-11 15:44:39 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								17b8e2bd02
								
							
								
							
						 | 
						
							
							
								
								Add remove room API
							
							
							
							
							
						 | 
						
							2017-09-26 15:52:41 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								e1dec2f1a7
								
							
								
							
						 | 
						
							
							
								
								Remove user from group summary when the leave the group
							
							
							
							
							
						 | 
						
							2017-09-21 16:09:57 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								197d82dc07
								
							
								
							
						 | 
						
							
							
								
								Correctly return next token
							
							
							
							
							
						 | 
						
							2017-09-20 11:12:11 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								069ae2df12
								
							
								
							
						 | 
						
							
							
								
								Fix initial sync
							
							
							
							
							
						 | 
						
							2017-09-20 10:52:12 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								2800983f3e
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #2410 from matrix-org/erikj/groups_publicise
							
							
							
							
							
							
							
							Add ability to publicise group membership 
							
						 | 
						
							2017-08-21 16:51:56 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								175a01f56c
								
							
								
							
						 | 
						
							
							
								
								Groups: Fix mising json.load in initial sync
							
							
							
							
							
						 | 
						
							2017-08-21 14:45:56 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								ef8e578677
								
							
								
							
						 | 
						
							
							
								
								Add bulk group publicised lookup API
							
							
							
							
							
						 | 
						
							2017-08-09 13:36:22 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								b880ff190a
								
							
								
							
						 | 
						
							
							
								
								Allow update group publicity
							
							
							
							
							
						 | 
						
							2017-08-08 14:19:41 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								05e21285aa
								
							
								
							
						 | 
						
							
							
								
								Store whether the user wants to publicise their membership of a group
							
							
							
							
							
						 | 
						
							2017-08-08 13:01:46 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								966a70f1fa
								
							
								
							
						 | 
						
							
							
								
								Update comment
							
							
							
							
							
						 | 
						
							2017-07-24 17:49:39 +01:00 | 
						
					
				
					
						
							
							
								 
								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
							
						 | 
						
							
							
							
							
								
							
								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
							
						 | 
						
							
							
							
							
								
							
								e52c391cd4
								
							
								
							
						 | 
						
							
							
								
								Rename column to attestation_json
							
							
							
							
							
						 | 
						
							2017-07-11 14:25:46 +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 |