ee2d722f0f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #276  from matrix-org/markjh/history_for_rooms_that_have_been_left  
							
							... 
							
							
							
							SPEC-216: Allow users to view the history of rooms that they have left. 
							
						 
						
							2015-09-21 14:38:13 +01:00  
				
					
						
							
							
								 
						
							
							
								184a5c81f0 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #274  from matrix-org/add_threepid_fix  
							
							... 
							
							
							
							Fix adding threepids to an existing account 
							
						 
						
							2015-09-10 10:36:58 +01:00  
				
					
						
							
							
								 
						
							
							
								30768dcf40 
								
							
								 
							
						 
						
							
							
								
								Fix adding threepids to an existing account  
							
							
							
						 
						
							2015-09-10 10:33:48 +01:00  
				
					
						
							
							
								 
						
							
							
								3c166a24c5 
								
							
								 
							
						 
						
							
							
								
								Remove undocumented and unimplemented 'feedback' parameter from the Client-Server API  
							
							
							
						 
						
							2015-09-09 16:05:09 +01:00  
				
					
						
							
							
								 
						
							
							
								bc8b25eb56 
								
							
								 
							
						 
						
							
							
								
								Allow users that have left the room to view the member list from the point they left  
							
							
							
						 
						
							2015-09-09 15:42:16 +01:00  
				
					
						
							
							
								 
						
							
							
								d3c0e48859 
								
							
								 
							
						 
						
							
							
								
								Merge erikj/user_dedup to develop  
							
							
							
						 
						
							2015-08-26 13:42:45 +01:00  
				
					
						
							
							
								 
						
							
							
								ee3fa1a99c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #248  from matrix-org/deviceid  
							
							... 
							
							
							
							Remove completely unused concepts from codebase 
							
						 
						
							2015-08-25 17:19:06 +01:00  
				
					
						
							
							
								 
						
							
							
								825f0875bc 
								
							
								 
							
						 
						
							
							
								
								Fix up one more reference  
							
							
							
						 
						
							2015-08-25 16:37:37 +01:00  
				
					
						
							
							
								 
						
							
							
								a0b181bd17 
								
							
								 
							
						 
						
							
							
								
								Remove completely unused concepts from codebase  
							
							... 
							
							
							
							Removes device_id and ClientInfo
device_id is never actually written, and the matrix.org DB has no
non-null entries for it. Right now, it's just cluttering up code.
This doesn't remove the columns from the database, because that's
fiddly. 
							
						 
						
							2015-08-25 16:23:06 +01:00  
				
					
						
							
							
								 
						
							
							
								78323ccdb3 
								
							
								 
							
						 
						
							
							
								
								Remove syutil dependency in favour of smaller single-purpose libraries  
							
							
							
						 
						
							2015-08-24 16:17:38 +01:00  
				
					
						
							
							
								 
						
							
							
								42f12ad92f 
								
							
								 
							
						 
						
							
							
								
								When logging in fetch user by user_id case insensitively, *unless* there are multiple case insensitive matches, in which case require the exact user_id  
							
							
							
						 
						
							2015-08-21 11:38:44 +01:00  
				
					
						
							
							
								 
						
							
							
								21b71b6d7c 
								
							
								 
							
						 
						
							
							
								
								Return fully qualified user_id as per spec  
							
							
							
						 
						
							2015-08-20 21:54:53 +01:00  
				
					
						
							
							
								 
						
							
							
								e8cf77fa49 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into refresh  
							
							... 
							
							
							
							Conflicts:
	synapse/rest/client/v1/login.py 
							
						 
						
							2015-08-20 16:25:40 +01:00  
				
					
						
							
							
								 
						
							
							
								cecbd636e9 
								
							
								 
							
						 
						
							
							
								
								/tokenrefresh POST endpoint  
							
							... 
							
							
							
							This allows refresh tokens to be exchanged for (access_token,
refresh_token).
It also starts issuing them on login, though no clients currently
interpret them. 
							
						 
						
							2015-08-20 16:21:35 +01:00  
				
					
						
							
							
								 
						
							
							
								f764f92647 
								
							
								 
							
						 
						
							
							
								
								Remove spurious extra arg to set_password  
							
							
							
						 
						
							2015-08-20 15:35:54 +01:00  
				
					
						
							
							
								 
						
							
							
								4cf302de5b 
								
							
								 
							
						 
						
							
							
								
								Comma comma comma comma comma chameleon  
							
							
							
						 
						
							2015-08-20 10:31:18 +01:00  
				
					
						
							
							
								 
						
							
							
								c50ad14bae 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into email_login  
							
							
							
						 
						
							2015-08-20 10:16:01 +01:00  
				
					
						
							
							
								 
						
							
							
								a0b8e5f2fe 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #211  from matrix-org/email_in_use  
							
							... 
							
							
							
							Changes for unique emails 
							
						 
						
							2015-08-20 10:04:04 +01:00  
				
					
						
							
							
								 
						
							
							
								8899df13bf 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #208  from matrix-org/markjh/end-to-end-key-federation  
							
							... 
							
							
							
							Federation for end-to-end key requests. 
							
						 
						
							2015-08-18 09:12:54 +01:00  
				
					
						
							
							
								 
						
							
							
								c5966b2a97 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into markjh/end-to-end-key-federation  
							
							
							
						 
						
							2015-08-13 17:27:53 +01:00  
				
					
						
							
							
								 
						
							
							
								415c2f0549 
								
							
								 
							
						 
						
							
							
								
								Simplify LoginHander and AuthHandler  
							
							... 
							
							
							
							* Merge LoginHandler -> AuthHandler
 * Add a bunch of documentation
 * Improve some naming
 * Remove unused branches
I will start merging the actual logic of the two handlers shortly 
							
						 
						
							2015-08-12 15:49:37 +01:00  
				
					
						
							
							
								 
						
							
							
								f43041aacd 
								
							
								 
							
						 
						
							
							
								
								Check absent before trying to access keys  
							
							
							
						 
						
							2015-08-12 15:44:08 +01:00  
				
					
						
							
							
								 
						
							
							
								73605f8070 
								
							
								 
							
						 
						
							
							
								
								Just leaving off the $ is fine. r* == registerrrrrrrrr  
							
							
							
						 
						
							2015-08-12 15:40:54 +01:00  
				
					
						
							
							
								 
						
							
							
								185ac7ee6c 
								
							
								 
							
						 
						
							
							
								
								Allow sign in using email address  
							
							
							
						 
						
							2015-08-04 16:29:54 +01:00  
				
					
						
							
							
								 
						
							
							
								a0dea6eaed 
								
							
								 
							
						 
						
							
							
								
								Remember to yield: not much point testing is a deferred is not None  
							
							
							
						 
						
							2015-08-04 16:18:17 +01:00  
				
					
						
							
							
								 
						
							
							
								883aabe423 
								
							
								 
							
						 
						
							
							
								
								splt long line  
							
							
							
						 
						
							2015-08-04 15:20:35 +01:00  
				
					
						
							
							
								 
						
							
							
								c77048e12f 
								
							
								 
							
						 
						
							
							
								
								Add endpoint that proxies ID server request token and errors if the given email is in use on this Home Server.  
							
							
							
						 
						
							2015-08-04 14:37:09 +01:00  
				
					
						
							
							
								 
						
							
							
								7148aaf5d0 
								
							
								 
							
						 
						
							
							
								
								Don't try & check the username if we don't have one (which we won't if it's been saved in the auth layer)  
							
							
							
						 
						
							2015-08-03 17:03:27 +01:00  
				
					
						
							
							
								 
						
							
							
								11b0a34074 
								
							
								 
							
						 
						
							
							
								
								Use the same reg paths as register v1 for ASes.  
							
							... 
							
							
							
							Namely this means using registration_handler.appservice_register. 
							
						 
						
							2015-07-29 10:00:54 +01:00  
				
					
						
							
							
								 
						
							
							
								a4d62ba36a 
								
							
								 
							
						 
						
							
							
								
								Fix v2_alpha registration. Add unit tests.  
							
							... 
							
							
							
							V2 Registration forced everyone (including ASes) to create a password for a
user, when ASes should be able to omit passwords. Also unbreak AS registration
in general which checked too early if the given username was claimed by an AS;
it was checked before knowing if the AS was the one doing the registration! Add
unit tests for AS reg, user reg and disabled_registration flag. 
							
						 
						
							2015-07-28 17:34:12 +01:00  
				
					
						
							
							
								 
						
							
							
								2da3b1e60b 
								
							
								 
							
						 
						
							
							
								
								Get the end-to-end key federation working  
							
							
							
						 
						
							2015-07-24 18:26:46 +01:00  
				
					
						
							
							
								 
						
							
							
								62c010283d 
								
							
								 
							
						 
						
							
							
								
								Add federation support for end-to-end key requests  
							
							
							
						 
						
							2015-07-23 16:03:38 +01:00  
				
					
						
							
							
								 
						
							
							
								a56eccbbfc 
								
							
								 
							
						 
						
							
							
								
								Query for all the ones we were asked about, not just the last...  
							
							
							
						 
						
							2015-07-21 16:38:16 -07:00  
				
					
						
							
							
								 
						
							
							
								3b5823c74d 
								
							
								 
							
						 
						
							
							
								
								s/take/claim/ for end to end key APIs  
							
							
							
						 
						
							2015-07-20 18:23:54 +01:00  
				
					
						
							
							
								 
						
							
							
								ddef5ea126 
								
							
								 
							
						 
						
							
							
								
								Remove semicolon.  
							
							
							
						 
						
							2015-07-20 14:02:36 +01:00  
				
					
						
							
							
								 
						
							
							
								b6ee0585bd 
								
							
								 
							
						 
						
							
							
								
								Parse the ID given to /invite|ban|kick to make sure it looks like a user ID.  
							
							
							
						 
						
							2015-07-20 13:55:19 +01:00  
				
					
						
							
							
								 
						
							
							
								b6d4a4c6d8 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #199  from matrix-org/erikj/receipts  
							
							... 
							
							
							
							Implement read receipts. 
							
						 
						
							2015-07-16 18:18:36 +01:00  
				
					
						
							
							
								 
						
							
							
								09489499e7 
								
							
								 
							
						 
						
							
							
								
								pep8 + debug line  
							
							
							
						 
						
							2015-07-15 19:39:18 +01:00  
				
					
						
							
							
								 
						
							
							
								4da05fa0ae 
								
							
								 
							
						 
						
							
							
								
								Add back in support for remembering parameters submitted to a user-interactive auth call.  
							
							
							
						 
						
							2015-07-15 19:28:57 +01:00  
				
					
						
							
							
								 
						
							
							
								5989637f37 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts  
							
							
							
						 
						
							2015-07-13 13:50:57 +01:00  
				
					
						
							
							
								 
						
							
							
								b7cb37b189 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #198  from matrix-org/markjh/client-end-to-end-key-management  
							
							... 
							
							
							
							Client end to end key management API 
							
						 
						
							2015-07-10 13:36:17 +01:00  
				
					
						
							
							
								 
						
							
							
								a01097d60b 
								
							
								 
							
						 
						
							
							
								
								Assume that each device for a user has only one of each type of key  
							
							
							
						 
						
							2015-07-10 13:26:18 +01:00  
				
					
						
							
							
								 
						
							
							
								f3049d0b81 
								
							
								 
							
						 
						
							
							
								
								Small tweaks to SAML2 configuration.  
							
							... 
							
							
							
							- Add saml2 config docs to default config.
- Use existence of saml2 config to indicate if saml2 should be enabled. 
							
						 
						
							2015-07-10 10:50:14 +01:00  
				
					
						
							
							
								 
						
							
							
								bf0d59ed30 
								
							
								 
							
						 
						
							
							
								
								Don't bother with a timeout for one time keys on the server.  
							
							
							
						 
						
							2015-07-09 14:04:03 +01:00  
				
					
						
							
							
								 
						
							
							
								8cd34dfe95 
								
							
								 
							
						 
						
							
							
								
								Make SAML2 optional and add some references/comments  
							
							
							
						 
						
							2015-07-09 13:34:47 +05:30  
				
					
						
							
							
								 
						
							
							
								d2caa5351a 
								
							
								 
							
						 
						
							
							
								
								code beautify  
							
							
							
						 
						
							2015-07-09 12:58:15 +05:30  
				
					
						
							
							
								 
						
							
							
								77c5db5977 
								
							
								 
							
						 
						
							
							
								
								code beautify  
							
							
							
						 
						
							2015-07-08 16:05:20 +05:30  
				
					
						
							
							
								 
						
							
							
								81682d0f82 
								
							
								 
							
						 
						
							
							
								
								Integrate SAML2 basic authentication - uses pysaml2  
							
							
							
						 
						
							2015-07-08 15:36:54 +05:30  
				
					
						
							
							
								 
						
							
							
								ca041d5526 
								
							
								 
							
						 
						
							
							
								
								Wire together receipts and the notifer/federation  
							
							
							
						 
						
							2015-07-07 15:25:30 +01:00  
				
					
						
							
							
								 
						
							
							
								e8b2f6f8a1 
								
							
								 
							
						 
						
							
							
								
								Add a ReceiptServlet  
							
							
							
						 
						
							2015-07-07 10:55:22 +01:00