0e8f5095c7 
								
							
								 
							
						 
						
							
							
								
								Fix unicode database support  
							
							
							
						 
						
							2015-03-25 17:15:20 +00:00  
				
					
						
							
							
								 
						
							
							
								f88db7ac0b 
								
							
								 
							
						 
						
							
							
								
								Factor out user id validation checks  
							
							
							
						 
						
							2015-03-18 11:34:18 +00:00  
				
					
						
							
							
								 
						
							
							
								57976f646f 
								
							
								 
							
						 
						
							
							
								
								Do more validation of incoming request  
							
							
							
						 
						
							2015-03-18 11:30:04 +00:00  
				
					
						
							
							
								 
						
							
							
								250e143084 
								
							
								 
							
						 
						
							
							
								
								Use 403 instead of 400  
							
							
							
						 
						
							2015-03-16 13:11:42 +00:00  
				
					
						
							
							
								 
						
							
							
								69135f59aa 
								
							
								 
							
						 
						
							
							
								
								Implement registering with shared secret.  
							
							
							
						 
						
							2015-03-13 15:23:37 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								6fab7bd2c1 
								
							
								 
							
						 
						
							
							
								
								s/user_name/user/ as per mjark's comment  
							
							
							
						 
						
							2015-03-02 18:17:19 +00:00  
				
					
						
							
							
								 
						
							
							
								09f9e8493c 
								
							
								 
							
						 
						
							
							
								
								Oops, missed a replacement.  
							
							
							
						 
						
							2015-03-02 17:37:22 +00:00  
				
					
						
							
							
								 
						
							
							
								20436cdf75 
								
							
								 
							
						 
						
							
							
								
								Blank lines  
							
							
							
						 
						
							2015-03-02 15:58:12 +00:00  
				
					
						
							
							
								 
						
							
							
								2a6dedd7cc 
								
							
								 
							
						 
						
							
							
								
								It's set_tweak now, not set_sound  
							
							
							
						 
						
							2015-02-27 18:38:56 +00:00  
				
					
						
							
							
								 
						
							
							
								1959088156 
								
							
								 
							
						 
						
							
							
								
								Add API for getting/setting enabled-ness of push rules.  
							
							
							
						 
						
							2015-02-26 18:07:44 +00:00  
				
					
						
							
							
								 
						
							
							
								a025055643 
								
							
								 
							
						 
						
							
							
								
								SYWEB-278 Don't allow rules with no rule_id.  
							
							
							
						 
						
							2015-02-25 14:02:38 +00:00  
				
					
						
							
							
								 
						
							
							
								15e2d7e387 
								
							
								 
							
						 
						
							
							
								
								Always allow AS to register  
							
							
							
						 
						
							2015-02-20 11:39:53 +00:00  
				
					
						
							
							
								 
						
							
							
								0722f982d3 
								
							
								 
							
						 
						
							
							
								
								Disable registration if config option was set.  
							
							
							
						 
						
							2015-02-19 14:22:20 +00:00  
				
					
						
							
							
								 
						
							
							
								0d872f5aa6 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #50  from matrix-org/application-services  
							
							... 
							
							
							
							Application Services 
							
						 
						
							2015-02-13 15:06:14 +00:00  
				
					
						
							
							
								 
						
							
							
								4ebbaf0d43 
								
							
								 
							
						 
						
							
							
								
								Blunty replace json with simplejson  
							
							
							
						 
						
							2015-02-11 14:23:10 +00:00  
				
					
						
							
							
								 
						
							
							
								9978c5c103 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into application-services  
							
							
							
						 
						
							2015-02-11 10:03:24 +00:00  
				
					
						
							
							
								 
						
							
							
								84a769cdb7 
								
							
								 
							
						 
						
							
							
								
								Fix code-style  
							
							
							
						 
						
							2015-02-10 17:58:36 +00:00  
				
					
						
							
							
								 
						
							
							
								b085fac735 
								
							
								 
							
						 
						
							
							
								
								Code-style fixes  
							
							
							
						 
						
							2015-02-10 16:30:48 +00:00  
				
					
						
							
							
								 
						
							
							
								53557fc532 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into application-services  
							
							
							
						 
						
							2015-02-09 15:20:56 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								c3ae8def75 
								
							
								 
							
						 
						
							
							
								
								Grant ASes the ability to delete aliases in their own namespace.  
							
							
							
						 
						
							2015-02-06 11:32:07 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								a93fa42bce 
								
							
								 
							
						 
						
							
							
								
								priority class now dealt with in namespaced rule_id  
							
							
							
						 
						
							2015-02-05 15:45:16 +00:00  
				
					
						
							
							
								 
						
							
							
								aaf50bf6f3 
								
							
								 
							
						 
						
							
							
								
								Give server default rules the 'default' attribute and fix various brokenness.  
							
							
							
						 
						
							2015-02-05 15:11:38 +00:00  
				
					
						
							
							
								 
						
							
							
								2df41aa138 
								
							
								 
							
						 
						
							
							
								
								Server default rules now of all kinds rather than all being at lowest prio.  
							
							
							
						 
						
							2015-02-05 14:46:37 +00:00  
				
					
						
							
							
								 
						
							
							
								f90782a658 
								
							
								 
							
						 
						
							
							
								
								namespace rule IDs to be unique within their scope and rule type.  
							
							
							
						 
						
							2015-02-05 14:46:37 +00:00  
				
					
						
							
							
								 
						
							
							
								2e77ba637a 
								
							
								 
							
						 
						
							
							
								
								More s/instance_handle/profile_tag/  
							
							
							
						 
						
							2015-02-04 16:24:15 +00:00  
				
					
						
							
							
								 
						
							
							
								dc7bb70f22 
								
							
								 
							
						 
						
							
							
								
								s/instance_handle/profile_tag/  
							
							
							
						 
						
							2015-02-03 16:51:07 +00:00  
				
					
						
							
							
								 
						
							
							
								b4b892f4a3 
								
							
								 
							
						 
						
							
							
								
								Spit out server default rules too.  
							
							
							
						 
						
							2015-01-30 15:54:51 +00:00  
				
					
						
							
							
								 
						
							
							
								4ffac34a64 
								
							
								 
							
						 
						
							
							
								
								Add glob asterisks when running rules.  
							
							... 
							
							
							
							Means that now you can't do exact matches even in override rules,
but I think we can live with that. Advantage is that you'll now
always get back what was put in to the API. 
							
						 
						
							2015-01-30 15:03:56 +00:00  
				
					
						
							
							
								 
						
							
							
								4bdfce30d7 
								
							
								 
							
						 
						
							
							
								
								Renumber priority classes so we can use 0 for defaults.  
							
							
							
						 
						
							2015-01-29 17:12:11 +00:00  
				
					
						
							
							
								 
						
							
							
								e0d2c6889b 
								
							
								 
							
						 
						
							
							
								
								Allow kind to be set to null to delete a pusher.  
							
							
							
						 
						
							2015-01-29 17:05:00 +00:00  
				
					
						
							
							
								 
						
							
							
								acb68a39e0 
								
							
								 
							
						 
						
							
							
								
								Code style fixes.  
							
							
							
						 
						
							2015-01-29 16:12:40 +00:00  
				
					
						
							
							
								 
						
							
							
								8552ed8df2 
								
							
								 
							
						 
						
							
							
								
								Change uses of get_user_by_req because it returns a tuple now.  
							
							
							
						 
						
							2015-01-28 18:04:40 +00:00  
				
					
						
							
							
								 
						
							
							
								26c8fff19e 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #36  from matrix-org/device_id_from_access_token  
							
							... 
							
							
							
							Extract the device id and token id from the access token when autheniticating users 
							
						 
						
							2015-01-28 17:19:28 +00:00  
				
					
						
							
							
								 
						
							
							
								388581e087 
								
							
								 
							
						 
						
							
							
								
								Extract the id token of the token when authing users, include the token and device_id in the internal meta data for the event along with the transaction id when sending events  
							
							
							
						 
						
							2015-01-28 16:58:23 +00:00  
				
					
						
							
							
								 
						
							
							
								c59bcabf0b 
								
							
								 
							
						 
						
							
							
								
								Return the device_id from get_auth_by_req  
							
							
							
						 
						
							2015-01-28 15:43:41 +00:00  
				
					
						
							
							
								 
						
							
							
								2cfdfee572 
								
							
								 
							
						 
						
							
							
								
								spaces  
							
							
							
						 
						
							2015-01-28 14:41:51 +00:00  
				
					
						
							
							
								 
						
							
							
								289a249874 
								
							
								 
							
						 
						
							
							
								
								Unnecessary newlines.  
							
							
							
						 
						
							2015-01-28 14:39:03 +00:00  
				
					
						
							
							
								 
						
							
							
								3cb5b73c0d 
								
							
								 
							
						 
						
							
							
								
								Unnecessary newline.  
							
							
							
						 
						
							2015-01-28 14:37:55 +00:00  
				
					
						
							
							
								 
						
							
							
								8807f4170e 
								
							
								 
							
						 
						
							
							
								
								Better style  
							
							
							
						 
						
							2015-01-28 14:35:00 +00:00  
				
					
						
							
							
								 
						
							
							
								032f8d4ed3 
								
							
								 
							
						 
						
							
							
								
								Another superfluous newline  
							
							
							
						 
						
							2015-01-28 14:33:15 +00:00  
				
					
						
							
							
								 
						
							
							
								d93ce29a86 
								
							
								 
							
						 
						
							
							
								
								Ah, the comma of doom.  
							
							
							
						 
						
							2015-01-28 14:27:01 +00:00  
				
					
						
							
							
								 
						
							
							
								6741c3dbd9 
								
							
								 
							
						 
						
							
							
								
								Brackets are nicer  
							
							
							
						 
						
							2015-01-28 14:26:03 +00:00  
				
					
						
							
							
								 
						
							
							
								4fbf2328c2 
								
							
								 
							
						 
						
							
							
								
								Unnecessary new line  
							
							
							
						 
						
							2015-01-28 14:24:28 +00:00  
				
					
						
							
							
								 
						
							
							
								20c47383dc 
								
							
								 
							
						 
						
							
							
								
								Oops, bad merge: needed to change the base class of the rest servlets too.  
							
							
							
						 
						
							2015-01-28 14:10:46 +00:00  
				
					
						
							
							
								 
						
							
							
								c291a4d522 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into pushers  
							
							... 
							
							
							
							Conflicts:
	synapse/handlers/events.py
	synapse/server.py 
							
						 
						
							2015-01-28 12:51:05 +00:00  
				
					
						
							
							
								 
						
							
							
								7f6f3f9d62 
								
							
								 
							
						 
						
							
							
								
								Pass the current time to serialize event, rather than passing an  
							
							... 
							
							
							
							HS and getting a clock from it and calling time_msec on the clock.
Remove the serialize_event method from the HS since it is no longer
needed. 
							
						 
						
							2015-01-26 16:11:28 +00:00