b64aa6d687 
								
							
								 
							
						 
						
							
							
								
								Add sender and contains_url field to events table  
							
							
							
						 
						
							2016-07-14 15:35:43 +01:00  
				
					
						
							
							
								 
						
							
							
								a37ee2293c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #915  from matrix-org/dbkr/more_requesttokens  
							
							... 
							
							
							
							Add requestToken endpoints 
							
						 
						
							2016-07-13 11:51:46 +01:00  
				
					
						
							
							
								 
						
							
							
								c55ad2e375 
								
							
								 
							
						 
						
							
							
								
								be more pythonic  
							
							
							
						 
						
							2016-07-12 14:15:10 +01:00  
				
					
						
							
							
								 
						
							
							
								aaa9d9f0e1 
								
							
								 
							
						 
						
							
							
								
								on_OPTIONS isn't neccessary  
							
							
							
						 
						
							2016-07-12 14:13:14 +01:00  
				
					
						
							
							
								 
						
							
							
								75fa7f6b3c 
								
							
								 
							
						 
						
							
							
								
								Remove other debug logging  
							
							
							
						 
						
							2016-07-12 14:08:57 +01:00  
				
					
						
							
							
								 
						
							
							
								a5db0026ed 
								
							
								 
							
						 
						
							
							
								
								Separate out requestTokens to separate handlers  
							
							
							
						 
						
							2016-07-11 09:57:07 +01:00  
				
					
						
							
							
								 
						
							
							
								9c491366c5 
								
							
								 
							
						 
						
							
							
								
								Oops, remove debug logging  
							
							
							
						 
						
							2016-07-11 09:07:40 +01:00  
				
					
						
							
							
								 
						
							
							
								385aec4010 
								
							
								 
							
						 
						
							
							
								
								Implement  https://github.com/matrix-org/matrix-doc/pull/346/files  
							
							
							
						 
						
							2016-07-08 17:42:48 +01:00  
				
					
						
							
							
								 
						
							
							
								dfde67a6fe 
								
							
								 
							
						 
						
							
							
								
								Add a comment explaining allow_none  
							
							
							
						 
						
							2016-07-08 15:57:06 +01:00  
				
					
						
							
							
								 
						
							
							
								10c843fcfb 
								
							
								 
							
						 
						
							
							
								
								Ensure that the guest user is in the database when upgrading accounts  
							
							
							
						 
						
							2016-07-08 15:15:55 +01:00  
				
					
						
							
							
								 
						
							
							
								58930da52b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of github.com:matrix-org/synapse into develop  
							
							
							
						 
						
							2016-07-08 14:11:37 +01:00  
				
					
						
							
							
								 
						
							
							
								0870588c20 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'hotfixes-v0.16.1'  
							
							
							
						 
						
							2016-07-08 13:22:32 +01:00  
				
					
						
							
							
								 
						
							
							
								f90cf150e2 
								
							
								 
							
						 
						
							
							
								
								Bump version and changelog  
							
							
							
						 
						
							2016-07-07 16:33:00 +01:00  
				
					
						
							
							
								 
						
							
							
								067596d341 
								
							
								 
							
						 
						
							
							
								
								Fix bug where we did not correctly explode when multiple user_ids were set in macaroon  
							
							
							
						 
						
							2016-07-07 16:22:24 +01:00  
				
					
						
							
							
								 
						
							
							
								b92e7955be 
								
							
								 
							
						 
						
							
							
								
								Comment  
							
							
							
						 
						
							2016-07-07 11:42:15 +01:00  
				
					
						
							
							
								 
						
							
							
								c98e1479bd 
								
							
								 
							
						 
						
							
							
								
								Return 400 rather than 500  
							
							
							
						 
						
							2016-07-07 11:41:07 +01:00  
				
					
						
							
							
								 
						
							
							
								67f2c901ea 
								
							
								 
							
						 
						
							
							
								
								Add rest servlet. Fix SQL.  
							
							
							
						 
						
							2016-07-06 15:56:59 +01:00  
				
					
						
							
							
								 
						
							
							
								eef7778af9 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/test2  
							
							
							
						 
						
							2016-07-06 14:50:22 +01:00  
				
					
						
							
							
								 
						
							
							
								a17e7caeb7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'erikj/shared_secret' into erikj/test2  
							
							
							
						 
						
							2016-07-06 14:46:31 +01:00  
				
					
						
							
							
								 
						
							
							
								f0c06ac65c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #909  from matrix-org/erikj/shared_secret  
							
							... 
							
							
							
							Add an admin option to shared secret registration (breaks backwards compat) 
							
						 
						
							2016-07-06 14:08:51 +01:00  
				
					
						
							
							
								 
						
							
							
								76b18df3d9 
								
							
								 
							
						 
						
							
							
								
								Check that there are no null bytes in user and passsword  
							
							
							
						 
						
							2016-07-06 11:17:53 +01:00  
				
					
						
							
							
								 
						
							
							
								0da24cac8b 
								
							
								 
							
						 
						
							
							
								
								Add null separator to hmac  
							
							
							
						 
						
							2016-07-06 11:05:16 +01:00  
				
					
						
							
							
								 
						
							
							
								8d9a884cee 
								
									
								
							
								 
							
						 
						
							
							
								
								Update password config comment  
							
							... 
							
							
							
							Signed-off-by: Kent Shikama <kent@kentshikama.com> 
							
						 
						
							2016-07-06 12:18:19 +09:00  
				
					
						
							
							
								 
						
							
							
								be3548f7e1 
								
							
								 
							
						 
						
							
							
								
								Remove spurious txn  
							
							
							
						 
						
							2016-07-05 17:46:51 +01:00  
				
					
						
							
							
								 
						
							
							
								4adf93e0f7 
								
							
								 
							
						 
						
							
							
								
								Fix for postgres  
							
							
							
						 
						
							2016-07-05 17:34:25 +01:00  
				
					
						
							
							
								 
						
							
							
								651faee698 
								
							
								 
							
						 
						
							
							
								
								Add an admin option to shared secret registration  
							
							
							
						 
						
							2016-07-05 17:30:22 +01:00  
				
					
						
							
							
								 
						
							
							
								caf33b2d9b 
								
							
								 
							
						 
						
							
							
								
								Protect password when registering using shared secret  
							
							
							
						 
						
							2016-07-05 17:18:19 +01:00  
				
					
						
							
							
								 
						
							
							
								8f8798bc0d 
								
							
								 
							
						 
						
							
							
								
								Add ReadWriteLock for pagination and history prune  
							
							
							
						 
						
							2016-07-05 15:30:25 +01:00  
				
					
						
							
							
								 
						
							
							
								7335f0adda 
								
							
								 
							
						 
						
							
							
								
								Add ReadWriteLock  
							
							
							
						 
						
							2016-07-05 15:23:17 +01:00  
				
					
						
							
							
								 
						
							
							
								ef535178ff 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #904  from matrix-org/dbkr/register_email_no_untrusted_id_server  
							
							... 
							
							
							
							requestToken update 
							
						 
						
							2016-07-05 15:13:34 +01:00  
				
					
						
							
							
								 
						
							
							
								04dee11e97 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #906  from matrix-org/markjh/faster_events_around  
							
							... 
							
							
							
							Use a query that postgresql optimises better for get_events_around 
							
						 
						
							2016-07-05 14:48:34 +01:00  
				
					
						
							
							
								 
						
							
							
								dd2ccee27d 
								
							
								 
							
						 
						
							
							
								
								Fix typo  
							
							
							
						 
						
							2016-07-05 14:06:07 +01:00  
				
					
						
							
							
								 
						
							
							
								b6b0132ac7 
								
							
								 
							
						 
						
							
							
								
								Make get_events_around more efficient on sqlite3  
							
							
							
						 
						
							2016-07-05 13:55:18 +01:00  
				
					
						
							
							
								 
						
							
							
								252ee2d979 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove default password pepper string  
							
							
							
						 
						
							2016-07-05 19:15:51 +09:00  
				
					
						
							
							
								 
						
							
							
								14362bf359 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix password config  
							
							
							
						 
						
							2016-07-05 19:12:53 +09:00  
				
					
						
							
							
								 
						
							
							
								1ee2584307 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix pep8  
							
							
							
						 
						
							2016-07-05 19:01:00 +09:00  
				
					
						
							
							
								 
						
							
							
								507b8bb091 
								
									
								
							
								 
							
						 
						
							
							
								
								Add comment to prompt changing of pepper  
							
							
							
						 
						
							2016-07-05 18:42:35 +09:00  
				
					
						
							
							
								 
						
							
							
								d44d11d864 
								
							
								 
							
						 
						
							
							
								
								Use true/false for boolean parameter inclusive to avoid potential for sqli, and possibly make the code clearer  
							
							
							
						 
						
							2016-07-05 10:39:13 +01:00  
				
					
						
							
							
								 
						
							
							
								2d21d43c34 
								
							
								 
							
						 
						
							
							
								
								Add purge_history API  
							
							
							
						 
						
							2016-07-05 10:28:51 +01:00  
				
					
						
							
							
								 
						
							
							
								0fb76c71ac 
								
							
								 
							
						 
						
							
							
								
								Use different SQL for postgres and sqlite3 for when using multicolumn indexes  
							
							
							
						 
						
							2016-07-04 19:44:55 +01:00  
				
					
						
							
							
								 
						
							
							
								8bdaf5f7af 
								
									
								
							
								 
							
						 
						
							
							
								
								Add pepper to password hashing  
							
							... 
							
							
							
							Signed-off-by: Kent Shikama <kent@kentshikama.com> 
							
						 
						
							2016-07-05 02:13:52 +09:00  
				
					
						
							
							
								 
						
							
							
								a67bf0b074 
								
							
								 
							
						 
						
							
							
								
								Add storage function to purge history for a room  
							
							
							
						 
						
							2016-07-04 16:02:50 +01:00  
				
					
						
							
							
								 
						
							
							
								f18d7546c6 
								
							
								 
							
						 
						
							
							
								
								Use a query that postgresql optimises better for get_events_around  
							
							
							
						 
						
							2016-07-04 15:48:25 +01:00  
				
					
						
							
							
								 
						
							
							
								bb069079bb 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix style violations  
							
							... 
							
							
							
							Signed-off-by: Kent Shikama <kent@kentshikama.com> 
							
						 
						
							2016-07-04 22:07:11 +09:00  
				
					
						
							
							
								 
						
							
							
								2e5a31f197 
								
							
								 
							
						 
						
							
							
								
								Use .get() instead of [] to access password_hash  
							
							
							
						 
						
							2016-07-04 22:00:13 +09:00  
				
					
						
							
							
								 
						
							
							
								fc8007dbec 
								
									
								
							
								 
							
						 
						
							
							
								
								Optionally include password hash in createUser endpoint  
							
							... 
							
							
							
							Signed-off-by: Kent Shikama <kent@kentshikama.com> 
							
						 
						
							2016-07-03 15:08:15 +09:00  
				
					
						
							
							
								 
						
							
							
								be8be535f7 
								
							
								 
							
						 
						
							
							
								
								requestToken update  
							
							... 
							
							
							
							Don't send requestToken request to untrusted ID servers
Also correct the THREEPID_IN_USE error to add the M_ prefix. This is a backwards incomaptible change, but the only thing using this is the angular client which is now unmaintained, so it's probably better to just do this now. 
							
						 
						
							2016-06-30 17:51:28 +01:00  
				
					
						
							
							
								 
						
							
							
								f328d95cef 
								
							
								 
							
						 
						
							
							
								
								Feature: Add deactivate account admin API  
							
							... 
							
							
							
							Allows server admins to "deactivate" accounts, which:
- Revokes all access tokens
- Removes all threepids
- Removes password
The API is a POST to `/admin/deactivate/<user_id>` 
							
						 
						
							2016-06-30 15:40:58 +01:00  
				
					
						
							
							
								 
						
							
							
								f52cb4cd78 
								
							
								 
							
						 
						
							
							
								
								Remove race  
							
							
							
						 
						
							2016-06-29 15:24:50 +01:00  
				
					
						
							
							
								 
						
							
							
								6783534a0f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #886  from matrix-org/markjh/async_commit  
							
							... 
							
							
							
							Optionally make committing to postgres asynchronous. 
							
						 
						
							2016-06-29 15:21:58 +01:00