Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								e7ca813dd4
								
							
								
							
						 | 
						
							
							
								
								Try to ensure we don't persist an event we have already persisted. In persist_event check if we already have the event, if so then update instead of replacing so that we don't cause a bump of the stream_ordering.
							
							
							
							
							
						 | 
						
							2015-02-03 10:39:41 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								78015948a7
								
							
								
							
						 | 
						
							
							
								
								Initial implementation of auth conflict resolution
							
							
							
							
							
						 | 
						
							2015-01-29 16:52:33 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								c3eae8a88c
								
							
								
							
						 | 
						
							
							
								
								Construct the EventContext in the state handler rather than constructing one and then immediately calling state_handler.annotate_context_with_state
							
							
							
							
							
						 | 
						
							2014-12-16 15:59:17 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								3c77d13aa5
								
							
								
							
						 | 
						
							
							
								
								Kill off synapse.api.events.*
							
							
							
							
							
						 | 
						
							2014-12-16 11:29:05 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								d3eb12c7b8
								
							
								
							
						 | 
						
							
							
								
								Fix federation test
							
							
							
							
							
						 | 
						
							2014-12-11 17:01:27 +00:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								8ada2d2018
								
							
								
							
						 | 
						
							
							
								
								fix UTs by telling all the mock stores about the new methods for tracking retries
							
							
							
							
							
						 | 
						
							2014-12-09 23:53:07 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								027542e2e5
								
							
								
							
						 | 
						
							
							
								
								Fix bugs when joining a remote room that has dodgy event graphs. This should also fix the number of times a HS will trigger a GET /event/
							
							
							
							
							
						 | 
						
							2014-11-27 16:02:26 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								822b15ea43
								
							
								
							
						 | 
						
							
							
								
								Fix tests.
							
							
							
							
							
						 | 
						
							2014-11-26 10:45:37 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								64fc859dac
								
							
								
							
						 | 
						
							
							
								
								Fix bugs in invite/join dances.
							
							
							
							
							
							
							
							We now do more implement more of the auth on the events so that we
don't reject valid events. 
							
						 | 
						
							2014-11-25 17:59:49 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								c5eabe3143
								
							
								
							
						 | 
						
							
							
								
								replace user_id with sender
							
							
							
							
							
						 | 
						
							2014-11-19 16:38:40 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								cb4b6c844a
								
							
								
							
						 | 
						
							
							
								
								Merge PDUs and Events into one object
							
							
							
							
							
						 | 
						
							2014-11-14 21:25:02 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								de1ec90133
								
							
								
							
						 | 
						
							
							
								
								Validate signatures on incoming events
							
							
							
							
							
						 | 
						
							2014-11-14 19:11:04 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								3db2c0d43e
								
							
								
							
						 | 
						
							
							
								
								Rename annotate_state_groups to annotate_event_with_state
							
							
							
							
							
						 | 
						
							2014-11-11 16:58:53 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								9e429239ab
								
							
								
							
						 | 
						
							
							
								
								Fix Federation test
							
							
							
							
							
						 | 
						
							2014-11-05 11:10:36 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								b0554682ed
								
							
								
							
						 | 
						
							
							
								
								Fix federation handler tests. I've removed the invite/join dance ones as they are completely out of date.
							
							
							
							
							
						 | 
						
							2014-11-04 16:51:59 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								f5cf7ac25b
								
							
								
							
						 | 
						
							
							
								
								SPEC-7: Rename 'ts' to 'origin_server_ts'
							
							
							
							
							
						 | 
						
							2014-10-17 17:12:25 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								9605593d11
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into server2server_signing
							
							
							
							
							
							
							
							Conflicts:
	synapse/storage/__init__.py
	tests/rest/test_presence.py 
							
						 | 
						
							2014-09-30 17:55:06 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								59f2bef187
								
							
								
							
						 | 
						
							
							
								
								Fix test where we changed arguments used to call the notifier
							
							
							
							
							
						 | 
						
							2014-09-25 13:04:33 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								52ca867670
								
							
								
							
						 | 
						
							
							
								
								Sign federation transactions
							
							
							
							
							
						 | 
						
							2014-09-24 17:25:41 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								59516a8bb1
								
							
								
							
						 | 
						
							
							
								
								Correctly handle receiving 'missing' Pdus from federation, rather than just discarding them.
							
							
							
							
							
						 | 
						
							2014-09-15 16:40:44 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								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 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								34a7f0ca93
								
							
								
							
						 | 
						
							
							
								
								Fix test to assert that we don't do auth
							
							
							
							
							
						 | 
						
							2014-09-03 19:13:29 +01:00 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								7b079a26a5
								
							
								
							
						 | 
						
							
							
								
								Remove get_state_for_room function from federation handler
							
							
							
							
							
						 | 
						
							2014-08-28 15:32:38 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								357dd1871d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into storage_transactions
							
							
							
							
							
							
							
							Conflicts:
	tests/handlers/test_federation.py
	tests/handlers/test_room.py 
							
						 | 
						
							2014-08-27 17:28:55 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								e111a06e0a
								
							
								
							
						 | 
						
							
							
								
								Fix tests.
							
							
							
							
							
						 | 
						
							2014-08-27 17:21:48 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								a03c7f27a8
								
							
								
							
						 | 
						
							
							
								
								Fill out prev_events before calling persist_event
							
							
							
							
							
						 | 
						
							2014-08-27 14:32:19 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								8bd55cfdcb
								
							
								
							
						 | 
						
							
							
								
								Fix ALL THE UNIT TESTS
							
							
							
							
							
						 | 
						
							2014-08-26 15:54:25 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								5c4c591c61
								
							
								
							
						 | 
						
							
							
								
								Fix federation test, since we now hit store.get_room
							
							
							
							
							
						 | 
						
							2014-08-20 14:59:43 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								41333452e5
								
							
								
							
						 | 
						
							
							
								
								Update tests
							
							
							
							
							
						 | 
						
							2014-08-19 15:52:20 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								9a1638ed21
								
							
								
							
						 | 
						
							
							
								
								Removed http_server from HomeServer. Updated unit tests to use either resource_for_federation or resource_for_client depending on what is being tested.
							
							
							
							
							
						 | 
						
							2014-08-14 10:18:54 +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 |