6d74e46621 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							
							
						 
						
							2015-03-09 17:01:11 +00:00  
				
					
						
							
							
								 
						
							
							
								0ebd632d39 
								
							
								 
							
						 
						
							
							
								
								Fix unit tests  
							
							
							
						 
						
							2015-02-27 09:46:38 +00:00  
				
					
						
							
							
								 
						
							
							
								f2fdcb7c4b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into application-services  
							
							
							
						 
						
							2015-02-11 16:43:26 +00:00  
				
					
						
							
							
								 
						
							
							
								896253e085 
								
							
								 
							
						 
						
							
							
								
								Factor out some of the common homeserver setup code into a  
							
							... 
							
							
							
							setup_test_homeserver function in utils. 
							
						 
						
							2015-02-11 11:37:30 +00:00  
				
					
						
							
							
								 
						
							
							
								5a7dd05818 
								
							
								 
							
						 
						
							
							
								
								Modify auth.get_user_by_req for authing appservices directly.  
							
							... 
							
							
							
							Add logic to map the appservice token to the autogenned appservice user ID.
Add unit tests for all forms of get_user_by_req (user/appservice,
valid/bad/missing tokens) 
							
						 
						
							2015-02-09 14:14:15 +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  
				
					
						
							
							
								 
						
							
							
								5759bec43c 
								
							
								 
							
						 
						
							
							
								
								Replace hs.parse_userid with UserID.from_string  
							
							
							
						 
						
							2015-01-23 11:47:15 +00:00  
				
					
						
							
							
								 
						
							
							
								7256def8e4 
								
							
								 
							
						 
						
							
							
								
								Merge rest servlets into the client json resource object  
							
							
							
						 
						
							2015-01-23 10:37:38 +00:00  
				
					
						
							
							
								 
						
							
							
								53584420a5 
								
							
								 
							
						 
						
							
							
								
								Move client rest tests back under rest  
							
							
							
						 
						
							2015-01-22 16:13:27 +00:00