Travis Ralston 
							
						 
					 
					
						
						
						
						
							
						
						
							2d314b771f 
							
						 
					 
					
						
						
							
							Add a route for determining who you are  
						
						... 
						
						
						
						Useful for applications which may have an access token, but no idea as to who owns it.
Signed-off-by: Travis Ralston <travpc@gmail.com> 
						
						
					 
					
						2017-11-12 23:39:38 -07:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							5d15abb120 
							
						 
					 
					
						
						
							
							Bit more logging  
						
						
						
						
					 
					
						2017-11-10 16:58:04 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							46790f50cf 
							
						 
					 
					
						
						
							
							Cache failures in url_preview handler  
						
						... 
						
						
						
						Reshuffle the caching logic in the url_preview handler so that failures are
cached (and to generally simplify things and fix the logcontext leaks). 
						
						
					 
					
						2017-11-10 16:50:50 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4d0414c714 
							
						 
					 
					
						
						
							
							Merge pull request  #2662  from matrix-org/rav/fix_mxids_again  
						
						... 
						
						
						
						Downcase userid on registration 
						
						
					 
					
						2017-11-10 13:57:34 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							e508145c9b 
							
						 
					 
					
						
						
							
							Add some more comments appservice user registration  
						
						... 
						
						
						
						Explain why we don't validate userids registered via app services 
						
						
					 
					
						2017-11-10 12:39:45 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							e0ebd1e4bd 
							
						 
					 
					
						
						
							
							Downcase userids for shared-secret registration  
						
						
						
						
					 
					
						2017-11-10 12:39:05 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							f90649eb2b 
							
						 
					 
					
						
						
							
							Fix 500 on invalid utf-8 in request  
						
						... 
						
						
						
						If somebody sends us a request where the the body is invalid utf-8, we should
return a 400 rather than a 500. (json.loads throws a UnicodeError in this
situation)
We might as well catch all Exceptions here: it seems very unlikely that we
would get a request that *isn't caused by invalid json. 
						
						
					 
					
						2017-11-10 09:15:39 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							9b599bc18d 
							
						 
					 
					
						
						
							
							Downcase userid on registration  
						
						... 
						
						
						
						Force username to lowercase before attempting to register
https://github.com/matrix-org/synapse/issues/2660  
						
						
					 
					
						2017-11-09 22:20:01 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							9b803ccc98 
							
						 
					 
					
						
						
							
							Revert "Allow upper-case characters in mxids"  
						
						... 
						
						
						
						This reverts commit b70b64690330c25cbd04c1b2cacf8276b566efc8. 
						
						
					 
					
						2017-11-09 21:57:24 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1282086f58 
							
						 
					 
					
						
						
							
							Merge pull request  #2659  from matrix-org/rav/apparently_we_dont_follow_our_own_spec_now  
						
						... 
						
						
						
						Allow upper-case characters in mxids 
						
						
					 
					
						2017-11-09 20:06:47 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							b70b646903 
							
						 
					 
					
						
						
							
							Allow upper-case characters in mxids  
						
						... 
						
						
						
						Because we're never going to be able to fix this :'( 
						
						
					 
					
						2017-11-09 19:36:13 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							2dce6b15c3 
							
						 
					 
					
						
						
							
							Fix typo  
						
						
						
						
					 
					
						2017-11-09 15:56:16 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							4e2b2508af 
							
						 
					 
					
						
						
							
							Register group servlet  
						
						
						
						
					 
					
						2017-11-09 15:49:42 +00:00 
						 
				 
			
				
					
						
							
							
								Luke Barnard 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0ea5310290 
							
						 
					 
					
						
						
							
							Merge pull request  #2657  from matrix-org/erikj/group_visibility_namespace  
						
						... 
						
						
						
						Namespace visibility options for groups 
						
						
					 
					
						2017-11-09 15:41:51 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							13735843c7 
							
						 
					 
					
						
						
							
							Namespace visibility options for groups  
						
						
						
						
					 
					
						2017-11-09 15:27:18 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							618c7b816a 
							
						 
					 
					
						
						
							
							Merge pull request  #2656  from matrix-org/rav/fix_deactivate  
						
						... 
						
						
						
						Fix 'NoneType' not iterable in /deactivate 
						
						
					 
					
						2017-11-09 15:20:35 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0fcb5a8ce5 
							
						 
					 
					
						
						
							
							Merge pull request  #2651  from matrix-org/erikj/update_group_room_settings  
						
						... 
						
						
						
						Change so that update group room visibility isn't an upsert 
						
						
					 
					
						2017-11-09 15:20:24 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							889102315e 
							
						 
					 
					
						
						
							
							Fix 'NoneType' not iterable in /deactivate  
						
						... 
						
						
						
						make sure we actually return a value from user_delete_access_tokens 
						
						
					 
					
						2017-11-09 15:15:33 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							b2a788e902 
							
						 
					 
					
						
						
							
							Make the commented config have the default  
						
						
						
						
					 
					
						2017-11-09 10:11:42 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							82e4bfb53d 
							
						 
					 
					
						
						
							
							Add brackets  
						
						
						
						
					 
					
						2017-11-09 10:06:42 +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 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d305987b40 
							
						 
					 
					
						
						
							
							Merge pull request  #2631  from xyzz/fix_appservice_event_backlog  
						
						... 
						
						
						
						Fix appservices being backlogged and not receiving new events due to a bug in notify_interested_services 
						
						
					 
					
						2017-11-08 11:54:10 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							167eb01d83 
							
						 
					 
					
						
						
							
							Merge pull request  #2637  from spantaleev/avoid-noop-media-deletes  
						
						... 
						
						
						
						Avoid no-op media deletes 
						
						
					 
					
						2017-11-08 11:53:27 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							ad408beb66 
							
						 
					 
					
						
						
							
							better comments  
						
						
						
						
					 
					
						2017-11-08 11:50:08 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							1b870937ae 
							
						 
					 
					
						
						
							
							Log if any of the old config flags are set  
						
						
						
						
					 
					
						2017-11-08 11:46:24 +00:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							2a98ba0ed3 
							
						 
					 
					
						
						
							
							Rename redact_content option to include_content  
						
						... 
						
						
						
						The redact_content option never worked because it read the wrong config
section. The PR introducing it
(https://github.com/matrix-org/synapse/pull/2301 ) had feedback suggesting the
name be changed to not re-use the term 'redact' but this wasn't
incorporated.
This reanmes the option to give it a less confusing name, and also
means that people who've set the redact_content option won't suddenly
see a behaviour change when upgrading synapse, but instead can set
include_content if they want to.
This PR also updates the wording of the config comment to clarify
that this has no effect on event_id_only push.
Includes https://github.com/matrix-org/synapse/pull/2422  
						
						
					 
					
						2017-11-08 10:35:30 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							02a9a93bde 
							
						 
					 
					
						
						
							
							Merge pull request  #2649  from matrix-org/rav/fix_delta_on_state_res  
						
						... 
						
						
						
						Fix bug in state group storage 
						
						
					 
					
						2017-11-08 09:22:13 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							e148438e97 
							
						 
					 
					
						
						
							
							s/items/iteritems/  
						
						
						
						
					 
					
						2017-11-08 09:21:41 +00:00 
						 
				 
			
				
					
						
							
							
								Ilya Zhuravlev 
							
						 
					 
					
						
						
						
						
							
						
						
							d46386d57e 
							
						 
					 
					
						
						
							
							Remove useless assignment in notify_interested_services  
						
						
						
						
					 
					
						2017-11-07 22:23:22 +03:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							228ccf1fe3 
							
						 
					 
					
						
						
							
							Merge pull request  #2643  from matrix-org/matthew/user_dir_typos  
						
						... 
						
						
						
						Fix various embarrassing typos around user_directory and add some doc. 
						
						
					 
					
						2017-11-07 17:31:11 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							780dbb378f 
							
						 
					 
					
						
						
							
							Update deltas when doing auth resolution  
						
						... 
						
						
						
						Fixes a bug where the persisted state groups were different to those actually
being used after auth resolution. 
						
						
					 
					
						2017-11-07 16:43:00 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							1ca4288135 
							
						 
					 
					
						
						
							
							factor out _update_context_for_auth_events  
						
						... 
						
						
						
						This is duplicated, so let's factor it out before fixing it 
						
						
					 
					
						2017-11-07 16:43:00 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							f5cf3638e9 
							
						 
					 
					
						
						
							
							move _state_group_cache to statestore  
						
						... 
						
						
						
						this is internal to statestore, so let's keep it there. 
						
						
					 
					
						2017-11-07 16:43:00 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5ef5e14ecc 
							
						 
					 
					
						
						
							
							Merge pull request  #2636  from farialima/me-master  
						
						... 
						
						
						
						Fix for #2635 : correctly update rooms avatar/display name when modified by admin 
						
						
					 
					
						2017-11-07 13:49:27 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							76c9af193c 
							
						 
					 
					
						
						
							
							Revert "Merge branch 'master' of github.com:matrix-org/synapse into develop"  
						
						... 
						
						
						
						This reverts commit f9b255cd62fe724e16b2222f6af623b2d39282ab, reversing
changes made to 1bd654dabde776bbb7ee365c115b307cd6a110b8. 
						
						
					 
					
						2017-11-07 13:32:35 +00:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							f9b255cd62 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:matrix-org/synapse into develop  
						
						
						
						
					 
					
						2017-11-07 13:31:03 +00:00 
						 
				 
			
				
					
						
							
							
								Krombel 
							
						 
					 
					
						
						
						
						
							
						
						
							44ad6dd4bf 
							
						 
					 
					
						
						
							
							update prometheus-config to new format  
						
						
						
						
					 
					
						2017-11-07 13:35:35 +01:00 
						 
				 
			
				
					
						
							
							
								Luke Barnard 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1bd654dabd 
							
						 
					 
					
						
						
							
							Merge pull request  #2647  from matrix-org/luke/get-group-users-is-privileged  
						
						... 
						
						
						
						Return whether a user is an admin within a group 
						
						
					 
					
						2017-11-07 12:05:11 +00:00 
						 
				 
			
				
					
						
							
							
								Luke Barnard 
							
						 
					 
					
						
						
						
						
							
						
						
							38b265cb51 
							
						 
					 
					
						
						
							
							Remember to pick is_admin out of the db  
						
						
						
						
					 
					
						2017-11-07 11:24:04 +00:00 
						 
				 
			
				
					
						
							
							
								Luke Barnard 
							
						 
					 
					
						
						
						
						
							
						
						
							5561c09091 
							
						 
					 
					
						
						
							
							Return whether a user is an admin within a group  
						
						
						
						
					 
					
						2017-11-07 11:18:45 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3db5ff69b2 
							
						 
					 
					
						
						
							
							Merge pull request  #2576  from maximevaillancourt/exclude-noscript-url-preview  
						
						... 
						
						
						
						Ignore <noscript> tags when generating URL preview descriptions 
						
						
					 
					
						2017-11-07 11:09:22 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ec12e7eada 
							
						 
					 
					
						
						
							
							Merge pull request  #2646  from matrix-org/rav/logging_for_limiter  
						
						... 
						
						
						
						Logging and logcontext fixes for Limiter 
						
						
					 
					
						2017-11-07 10:47:00 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							631fa4a1b7 
							
						 
					 
					
						
						
							
							create new indexes before dropping old ones to keep safetynet in place  
						
						
						
						
					 
					
						2017-11-07 10:41:55 +00:00 
						 
				 
			
				
					
						
							
							
								Richard van der Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							bf993db11c 
							
						 
					 
					
						
						
							
							Logging and logcontext fixes for Limiter  
						
						... 
						
						
						
						Add some logging to the Limiter in a similar spirit to the Linearizer, to help
debug issues.
Also fix a logcontext leak.
Also refactor slightly to avoid throwing exceptions. 
						
						
					 
					
						2017-11-07 00:48:57 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							4ad883398f 
							
						 
					 
					
						
						
							
							s/users_in_pubic_room/users_in_public_rooms/g  
						
						
						
						
					 
					
						2017-11-04 19:39:40 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							d802e8ca6a 
							
						 
					 
					
						
						
							
							s/users_in_pubic_room/users_in_public_rooms/g  
						
						
						
						
					 
					
						2017-11-04 19:38:13 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							a100700630 
							
						 
					 
					
						
						
							
							fix copyright....  
						
						
						
						
					 
					
						2017-11-04 19:35:49 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							b6b075fd49 
							
						 
					 
					
						
						
							
							s/popualte/populate/  
						
						
						
						
					 
					
						2017-11-04 19:35:33 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							d1622e080f 
							
						 
					 
					
						
						
							
							s/intial/initial/  
						
						
						
						
					 
					
						2017-11-04 19:35:14 +00:00