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  
				
					
						
							
							
								 
						
							
							
								a7122692d9 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'release-v0.10.0' into develop  
							
							... 
							
							
							
							Conflicts:
	synapse/handlers/auth.py
	synapse/python_dependencies.py
	synapse/rest/client/v1/login.py 
							
						 
						
							2015-08-28 11:15:27 +01:00  
				
					
						
							
							
								 
						
							
							
								ddf4d2bd98 
								
							
								 
							
						 
						
							
							
								
								Consistency  
							
							
							
						 
						
							2015-08-27 10:50:49 +01:00  
				
					
						
							
							
								 
						
							
							
								66ec6cf9b8 
								
							
								 
							
						 
						
							
							
								
								Check for an internationalised filename first  
							
							
							
						 
						
							2015-08-27 10:48:58 +01:00  
				
					
						
							
							
								 
						
							
							
								53c2eed862 
								
							
								 
							
						 
						
							
							
								
								None check the correct variable  
							
							
							
						 
						
							2015-08-27 10:38:22 +01:00  
				
					
						
							
							
								 
						
							
							
								f02532baad 
								
							
								 
							
						 
						
							
							
								
								Check for None  
							
							
							
						 
						
							2015-08-27 10:37:02 +01:00  
				
					
						
							
							
								 
						
							
							
								c9cb354b58 
								
							
								 
							
						 
						
							
							
								
								Give a sensible error message if the filename is invalid UTF-8  
							
							
							
						 
						
							2015-08-26 17:27:23 +01:00  
				
					
						
							
							
								 
						
							
							
								5a9e0c3682 
								
							
								 
							
						 
						
							
							
								
								Handle unicode filenames given when downloading or received over federation  
							
							
							
						 
						
							2015-08-26 17:08:47 +01:00  
				
					
						
							
							
								 
						
							
							
								e85c7873dc 
								
							
								 
							
						 
						
							
							
								
								Allow non-ascii filenames for attachments  
							
							
							
						 
						
							2015-08-26 16:26:37 +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  
				
					
						
							
							
								 
						
							
							
								22346a0ee7 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #206  from matrix-org/erikj/generate_presice_thumbnails  
							
							... 
							
							
							
							Always return a thumbnail of the requested size. 
							
						 
						
							2015-08-20 11:27:15 +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  
				
					
						
							
							
								 
						
							
							
								b16cd18a86 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into erikj/generate_presice_thumbnails  
							
							
							
						 
						
							2015-08-13 17:23:39 +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  
				
					
						
							
							
								 
						
							
							
								fdb724cb70 
								
							
								 
							
						 
						
							
							
								
								Add config option for setting the list of thumbnail sizes to precalculate  
							
							
							
						 
						
							2015-08-12 10:55:27 +01:00  
				
					
						
							
							
								 
						
							
							
								7e3d1c7d92 
								
							
								 
							
						 
						
							
							
								
								Make a config option for whether to generate new thumbnail sizes dynamically  
							
							
							
						 
						
							2015-08-12 10:54:38 +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  
				
					
						
							
							
								 
						
							
							
								459085184c 
								
							
								 
							
						 
						
							
							
								
								Factor out thumbnail()  
							
							
							
						 
						
							2015-07-23 15:59:53 +01:00  
				
					
						
							
							
								 
						
							
							
								2b4f47db9c 
								
							
								 
							
						 
						
							
							
								
								Generate local thumbnails on a thread  
							
							
							
						 
						
							2015-07-23 14:52:29 +01:00  
				
					
						
							
							
								 
						
							
							
								33d83f3615 
								
							
								 
							
						 
						
							
							
								
								Fix remote thumbnailing  
							
							
							
						 
						
							2015-07-23 14:24:21 +01:00  
				
					
						
							
							
								 
						
							
							
								ff7c2e41de 
								
							
								 
							
						 
						
							
							
								
								Always return a thumbnail of the requested size.  
							
							... 
							
							
							
							Before, we returned a thumbnail that was at least as big (if possible)
as the requested size. Now, if we don't have a thumbnail of the given
size we generate (and persist) one of that size. 
							
						 
						
							2015-07-23 14:12:49 +01:00  
				
					
						
							
							
								 
						
							
							
								103e1c2431 
								
							
								 
							
						 
						
							
							
								
								Pick larger than desired thumbnail for 'crop'  
							
							
							
						 
						
							2015-07-23 11:12:49 +01:00  
				
					
						
							
							
								 
						
							
							
								a56eccbbfc 
								
							
								 
							
						 
						
							
							
								
								Query for all the ones we were asked about, not just the last...  
							
							
							
						 
						
							2015-07-21 16:38:16 -07:00