Erik Johnston
							
						 
						
							 
							
							
							
								
							
								f88db7ac0b 
								
							
								 
							
						 
						
							
							
								
								Factor out user id validation checks  
							
							 
							
							
							
						 
						
							2015-03-18 11:34:18 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								57976f646f 
								
							
								 
							
						 
						
							
							
								
								Do more validation of incoming request  
							
							 
							
							
							
						 
						
							2015-03-18 11:30:04 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								250e143084 
								
							
								 
							
						 
						
							
							
								
								Use 403 instead of 400  
							
							 
							
							
							
						 
						
							2015-03-16 13:11:42 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								69135f59aa 
								
							
								 
							
						 
						
							
							
								
								Implement registering with shared secret.  
							
							 
							
							
							
						 
						
							2015-03-13 15:23:37 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								f55bd3f94b 
								
							
								 
							
						 
						
							
							
								
								bump dep on syweb 0.6.5  
							
							 
							
							
							
						 
						
							2015-03-12 18:56:53 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								04f8478aaa 
								
							
								 
							
						 
						
							
							
								
								Add the master push rule for the break-my-push button. Allow server default rules to be disabled by default.  
							
							 
							
							
							
						 
						
							2015-03-10 17:26:25 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								92b3dc3219 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into pushrules2  
							
							 
							
							
							
						 
						
							2015-03-04 14:56:41 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								6fab7bd2c1 
								
							
								 
							
						 
						
							
							
								
								s/user_name/user/ as per mjark's comment  
							
							 
							
							
							
						 
						
							2015-03-02 18:17:19 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								09f9e8493c 
								
							
								 
							
						 
						
							
							
								
								Oops, missed a replacement.  
							
							 
							
							
							
						 
						
							2015-03-02 17:37:22 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								20436cdf75 
								
							
								 
							
						 
						
							
							
								
								Blank lines  
							
							 
							
							
							
						 
						
							2015-03-02 15:58:12 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								2a6dedd7cc 
								
							
								 
							
						 
						
							
							
								
								It's set_tweak now, not set_sound  
							
							 
							
							
							
						 
						
							2015-02-27 18:38:56 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								16b90764ad 
								
							
								 
							
						 
						
							
							
								
								Convert expected format for AS regex to include exclusivity.  
							
							 
							
							... 
							
							
							
							Previously you just specified the regex as a string, now it expects a JSON
object with a 'regex' key and an 'exclusive' boolean, as per spec. 
							
						 
						
							2015-02-27 10:44:32 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								1959088156 
								
							
								 
							
						 
						
							
							
								
								Add API for getting/setting enabled-ness of push rules.  
							
							 
							
							
							
						 
						
							2015-02-26 18:07:44 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								a025055643 
								
							
								 
							
						 
						
							
							
								
								SYWEB-278 Don't allow rules with no rule_id.  
							
							 
							
							
							
						 
						
							2015-02-25 14:02:38 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								15e2d7e387 
								
							
								 
							
						 
						
							
							
								
								Always allow AS to register  
							
							 
							
							
							
						 
						
							2015-02-20 11:39:53 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0722f982d3 
								
							
								 
							
						 
						
							
							
								
								Disable registration if config option was set.  
							
							 
							
							
							
						 
						
							2015-02-19 14:22:20 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								6375bd3e33 
								
							
								 
							
						 
						
							
							
								
								SYN-282: Don't log tracebacks for client errors  
							
							 
							
							
							
						 
						
							2015-02-18 12:01:37 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								0d872f5aa6 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #50  from matrix-org/application-services  
							
							 
							
							... 
							
							
							
							Application Services 
							
						 
						
							2015-02-13 15:06:14 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4ebbaf0d43 
								
							
								 
							
						 
						
							
							
								
								Blunty replace json with simplejson  
							
							 
							
							
							
						 
						
							2015-02-11 14:23:10 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								14d413752b 
								
							
								 
							
						 
						
							
							
								
								Fix newline on __init__  
							
							 
							
							
							
						 
						
							2015-02-11 10:53:47 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								fd40d992ad 
								
							
								 
							
						 
						
							
							
								
								PEP8-ify  
							
							 
							
							
							
						 
						
							2015-02-11 10:41:33 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								8beb613916 
								
							
								 
							
						 
						
							
							
								
								Add newline to EOF  
							
							 
							
							
							
						 
						
							2015-02-11 10:36:48 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								c7783d6fee 
								
							
								 
							
						 
						
							
							
								
								Notify ASes for events sent by other users in a room which an AS user is a part of.  
							
							 
							
							
							
						 
						
							2015-02-11 10:36:08 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								9978c5c103 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into application-services  
							
							 
							
							
							
						 
						
							2015-02-11 10:03:24 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								84a769cdb7 
								
							
								 
							
						 
						
							
							
								
								Fix code-style  
							
							 
							
							
							
						 
						
							2015-02-10 17:58:36 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								b085fac735 
								
							
								 
							
						 
						
							
							
								
								Code-style fixes  
							
							 
							
							
							
						 
						
							2015-02-10 16:30:48 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								53557fc532 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into application-services  
							
							 
							
							
							
						 
						
							2015-02-09 15:20:56 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								24cc6979fb 
								
							
								 
							
						 
						
							
							
								
								Log when we receive a request, when we send a response and how long it took to process it.  
							
							 
							
							
							
						 
						
							2015-02-09 13:46:22 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								582019f870 
								
							
								 
							
						 
						
							
							
								
								...and here's the actual impl. git fail.  
							
							 
							
							
							
						 
						
							2015-02-07 13:32:14 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								e117bc3fc5 
								
							
								 
							
						 
						
							
							
								
								thou shalt specify a content-length  
							
							 
							
							
							
						 
						
							2015-02-07 12:56:21 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								34c39398fa 
								
							
								 
							
						 
						
							
							
								
								i hate weakly typed languages  
							
							 
							
							
							
						 
						
							2015-02-07 12:55:13 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								c3ae8def75 
								
							
								 
							
						 
						
							
							
								
								Grant ASes the ability to delete aliases in their own namespace.  
							
							 
							
							
							
						 
						
							2015-02-06 11:32:07 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								e426df8e10 
								
							
								 
							
						 
						
							
							
								
								Grant ASes the ability to create alias in their own namespace.  
							
							 
							
							... 
							
							
							
							Add a new errcode type M_EXCLUSIVE when users try to create aliases inside
AS namespaces, and when ASes try to create aliases outside their own
namespace. 
							
						 
						
							2015-02-06 10:57:14 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								0227618d3c 
								
							
								 
							
						 
						
							
							
								
								Add m.login.application_service registration procedure.  
							
							 
							
							... 
							
							
							
							This allows known application services to register any user ID under their
own user namespace(s). 
							
						 
						
							2015-02-05 17:29:27 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								c20281ee33 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into application-services  
							
							 
							
							
							
						 
						
							2015-02-05 16:11:34 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								a93fa42bce 
								
							
								 
							
						 
						
							
							
								
								priority class now dealt with in namespaced rule_id  
							
							 
							
							
							
						 
						
							2015-02-05 15:45:16 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								fc8bcc809d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into application-services  
							
							 
							
							
							
						 
						
							2015-02-05 15:32:45 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								aaf50bf6f3 
								
							
								 
							
						 
						
							
							
								
								Give server default rules the 'default' attribute and fix various brokenness.  
							
							 
							
							
							
						 
						
							2015-02-05 15:11:38 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								2df41aa138 
								
							
								 
							
						 
						
							
							
								
								Server default rules now of all kinds rather than all being at lowest prio.  
							
							 
							
							
							
						 
						
							2015-02-05 14:46:37 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								f90782a658 
								
							
								 
							
						 
						
							
							
								
								namespace rule IDs to be unique within their scope and rule type.  
							
							 
							
							
							
						 
						
							2015-02-05 14:46:37 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								951690e54d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into application-services  
							
							 
							
							
							
						 
						
							2015-02-05 14:28:03 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								27091f146a 
								
							
								 
							
						 
						
							
							
								
								Add hs_token column and generate a different token f.e application service.  
							
							 
							
							
							
						 
						
							2015-02-05 10:08:12 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								2e77ba637a 
								
							
								 
							
						 
						
							
							
								
								More s/instance_handle/profile_tag/  
							
							 
							
							
							
						 
						
							2015-02-04 16:24:15 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								ce8bc642ae 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into application-services  
							
							 
							
							
							
						 
						
							2015-02-04 15:31:02 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								dc7bb70f22 
								
							
								 
							
						 
						
							
							
								
								s/instance_handle/profile_tag/  
							
							 
							
							
							
						 
						
							2015-02-03 16:51:07 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								1bb0528316 
								
							
								 
							
						 
						
							
							
								
								Add Cache-Control header to identicon  
							
							 
							
							
							
						 
						
							2015-02-02 16:57:26 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								f2eda123b7 
								
							
								 
							
						 
						
							
							
								
								Fix setting identicon width and height  
							
							 
							
							
							
						 
						
							2015-02-02 16:32:33 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								038f5afb07 
								
							
								 
							
						 
						
							
							
								
								Spell height more correctly  
							
							 
							
							
							
						 
						
							2015-02-02 16:29:18 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								22c1ffb0a0 
								
							
								 
							
						 
						
							
							
								
								Add a media/v1/identicon resource for generating identicons using pydenticon  
							
							 
							
							
							
						 
						
							2015-02-02 16:02:31 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								c059c9fea5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into application-services  
							
							 
							
							... 
							
							
							
							Conflicts:
	synapse/handlers/__init__.py
	synapse/storage/__init__.py 
							
						 
						
							2015-02-02 15:57:59 +00:00