|  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 |