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  
				
					
						
							
							
								 
						
							
							
								ab3c897ce1 
								
							
								 
							
						 
						
							
							
								
								Remove unused imports.  
							
							
							
						 
						
							2015-02-09 14:16:36 +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  
				
					
						
							
							
								 
						
							
							
								93ed31dda2 
								
							
								 
							
						 
						
							
							
								
								Create a separate filter object to do the actual filtering, so that we can  
							
							... 
							
							
							
							split the storage and management of filters from the actual filter code
and don't have to load a filter from the db each time we filter an event 
							
						 
						
							2015-01-29 17:45:07 +00:00  
				
					
						
							
							
								 
						
							
							
								38b27bd2cb 
								
							
								 
							
						 
						
							
							
								
								Add filter_room_state unit tests.  
							
							
							
						 
						
							2015-01-29 14:28:34 +00:00  
				
					
						
							
							
								 
						
							
							
								83172487b0 
								
							
								 
							
						 
						
							
							
								
								Add basic filtering public API unit tests. Use defers in the right places.  
							
							
							
						 
						
							2015-01-29 12:20:59 +00:00  
				
					
						
							
							
								 
						
							
							
								5561a87920 
								
							
								 
							
						 
						
							
							
								
								Add more unit tests for the filter algorithm.  
							
							
							
						 
						
							2015-01-29 12:06:16 +00:00  
				
					
						
							
							
								 
						
							
							
								777d9914b5 
								
							
								 
							
						 
						
							
							
								
								Implement filter algorithm. Add basic event type unit tests to assert it works.  
							
							
							
						 
						
							2015-01-29 11:38:06 +00:00  
				
					
						
							
							
								 
						
							
							
								c23e3db544 
								
							
								 
							
						 
						
							
							
								
								Add filter JSON sanity checks.  
							
							
							
						 
						
							2015-01-28 16:45:18 +00:00  
				
					
						
							
							
								 
						
							
							
								06cc147012 
								
							
								 
							
						 
						
							
							
								
								Initial stab at real SQL storage implementation of user filter definitions  
							
							
							
						 
						
							2015-01-27 18:46:03 +00:00  
				
					
						
							
							
								 
						
							
							
								059651efa1 
								
							
								 
							
						 
						
							
							
								
								Have the Filtering API return Deferreds, so we can do the Datastore implementation nicely  
							
							
							
						 
						
							2015-01-27 16:17:56 +00:00  
				
					
						
							
							
								 
						
							
							
								b1503112ce 
								
							
								 
							
						 
						
							
							
								
								Initial trivial unittest of Filtering object  
							
							
							
						 
						
							2015-01-27 15:56:14 +00:00  
				
					
						
							
							
								 
						
							
							
								cd62ee3f29 
								
							
								 
							
						 
						
							
							
								
								Have all unit tests import from our own subclass of trial's unittest TestCase; set up logging in ONE PLACE ONLY  
							
							
							
						 
						
							2014-09-12 18:46:13 +01:00  
				
					
						
							
							
								 
						
							
							
								dd2cd9312a 
								
							
								 
							
						 
						
							
							
								
								Test ratelimiter  
							
							
							
						 
						
							2014-09-02 15:16:26 +01:00