Matthew Hodgson
							
						 
					 | 
					
						
						
						
						
							
						
						
							8a7c1d6a00
							
						
					 | 
					
						
						
							
							fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.
						
						
						
						
						
						
					 | 
					
						2014-09-03 17:31:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							a808c06a10
							
						
					 | 
					
						
						
							
							Fix room permissions test
						
						
						
						
						
						
					 | 
					
						2014-09-02 11:03:03 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							3f5ebccbff
							
						
					 | 
					
						
						
							
							Fix the tests to include new db calls
						
						
						
						
						
						
					 | 
					
						2014-09-01 19:57:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
					 | 
					
						
						
						
						
							
						
						
							59d3955db1
							
						
					 | 
					
						
						
							
							Have MemoryDataStore's get_rooms_for_user_where_membership_is() return room membership event objects, as per interface contract
						
						
						
						
						
						
					 | 
					
						2014-09-01 16:15:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							5dd38d579b
							
						
					 | 
					
						
						
							
							Fix a couple of bugs in presence handler related to pushing updatesto the correct user. Fix presence tests.
						
						
						
						
						
						
					 | 
					
						2014-08-29 12:08:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
					 | 
					
						
						
						
						
							
						
						
							113342a756
							
						
					 | 
					
						
						
							
							Ability to assert a DeferredMockCallable has received no calls
						
						
						
						
						
						
					 | 
					
						2014-08-28 16:40:06 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Haines
							
						 
					 | 
					
						
						
						
						
							
						
						
							7b079a26a5
							
						
					 | 
					
						
						
							
							Remove get_state_for_room function from federation handler
						
						
						
						
						
						
					 | 
					
						2014-08-28 15:32:38 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Haines
							
						 
					 | 
					
						
						
						
						
							
						
						
							a03c7f27a8
							
						
					 | 
					
						
						
							
							Fill out prev_events before calling persist_event
						
						
						
						
						
						
					 | 
					
						2014-08-27 14:32:19 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Haines
							
						 
					 | 
					
						
						
						
						
							
						
						
							4b63b06cad
							
						
					 | 
					
						
						
							
							Merge branch 'develop' into storage_transactions
						
						
						
						
						
						
						
						Conflicts:
	synapse/api/auth.py
	synapse/handlers/room.py
	synapse/storage/__init__.py 
						
						
					 | 
					
						2014-08-26 16:07:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kegan Dougal
							
						 
					 | 
					
						
						
						
						
							
						
						
							8bd55cfdcb
							
						
					 | 
					
						
						
							
							Fix ALL THE UNIT TESTS
						
						
						
						
						
						
					 | 
					
						2014-08-26 15:54:25 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Haines
							
						 
					 | 
					
						
						
						
						
							
						
						
							1379dcae6f
							
						
					 | 
					
						
						
							
							Take a snapshot of the state of the room before performing updates
						
						
						
						
						
						
					 | 
					
						2014-08-22 17:00:10 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							347242a5c4
							
						
					 | 
					
						
						
							
							Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
						
						
						
						
						
						
						
						Conflicts:
	tests/rest/test_presence.py
	tests/rest/test_rooms.py
	tests/utils.py 
						
						
					 | 
					
						2014-08-19 14:48:19 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
					 | 
					
						
						
						
						
							
						
						
							fcdc40a5dd
							
						
					 | 
					
						
						
							
							Add a DeferredMockCallable; like mock's MockCallable but allows awaiting
						
						
						
						
						
						
						
						on method calls to be made later 
						
						
					 | 
					
						2014-08-19 14:25:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
					 | 
					
						
						
						
						
							
						
						
							bb793019a5
							
						
					 | 
					
						
						
							
							Rename MockHttpServer to MockHttpResource as it stands for one server resource rather than an entire server
						
						
						
						
						
						
					 | 
					
						2014-08-19 11:16:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							663a259d64
							
						
					 | 
					
						
						
							
							Change the MemoryDataStore to implement new storage api
						
						
						
						
						
						
					 | 
					
						2014-08-18 11:08:03 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Johnston
							
						 
					 | 
					
						
						
						
						
							
						
						
							f5fca6f787
							
						
					 | 
					
						
						
							
							Fix some of the tests to reflect changes in the storage layer.
						
						
						
						
						
						
					 | 
					
						2014-08-15 17:42:21 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
					 | 
					
						
						
						
						
							
						
						
							a6a9b71da0
							
						
					 | 
					
						
						
							
							Allow advancing the MockClock's time
						
						
						
						
						
						
					 | 
					
						2014-08-13 19:19:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
					 | 
					
						
						
						
						
							
						
						
							fc778e2bce
							
						
					 | 
					
						
						
							
							Move MockClock into tests.utils so we can reüse it
						
						
						
						
						
						
					 | 
					
						2014-08-13 19:19:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
					 | 
					
						
						
						
						
							
						
						
							3e35a9f96e
							
						
					 | 
					
						
						
							
							add in copyrights to everything, not just the synapse subdir, and add a copyrighter.pl whilst we're at it
						
						
						
						
						
						
					 | 
					
						2014-08-13 03:32:18 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								matrix.org
							
						 
					 | 
					
						
						
						
						
							
						
						
							4f475c7697
							
						
					 | 
					
						
						
							
							Reference Matrix Home Server
						
						
						
						
						
						
					 | 
					
						2014-08-12 15:10:52 +01:00 | 
					
					
						
						
							
							
							
						
					 |