Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								2ebf795c0a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into rejections
							
							
							
							
							
							
							
							Conflicts:
	synapse/storage/__init__.py
	synapse/storage/schema/delta/v12.sql 
							
						 | 
						
							2015-01-30 11:10:37 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								5a3a15f5c1
								
							
								
							
						 | 
						
							
							
								
								Make post_json(...) actually send data.
							
							
							
							
							
						 | 
						
							2015-01-29 13:58:22 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								c183cec8f6
								
							
								
							
						 | 
						
							
							
								
								Add post_json(...) method to federation client
							
							
							
							
							
						 | 
						
							2015-01-29 13:44:52 +00:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								c291a4d522
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into pushers
							
							
							
							
							
							
							
							Conflicts:
	synapse/handlers/events.py
	synapse/server.py 
							
						 | 
						
							2015-01-28 12:51:05 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								7b814d3f7f
								
							
								
							
						 | 
						
							
							
								
								Add client v2_alpha resource to synapse server resource tree
							
							
							
							
							
						 | 
						
							2015-01-23 18:55:19 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								e0bf18addf
								
							
								
							
						 | 
						
							
							
								
								Add RestServlet base class in synapse/http/servlet.py
							
							
							
							
							
						 | 
						
							2015-01-23 14:16:28 +00:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								5c6189ea3e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into pushers
							
							
							
							
							
							
							
							Conflicts:
	synapse/rest/__init__.py 
							
						 | 
						
							2015-01-22 17:46:16 +00:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								ede491b4e0
								
							
								
							
						 | 
						
							
							
								
								Oops: second part of commit dc938606
							
							
							
							
							
						 | 
						
							2015-01-22 17:38:53 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								5fed042640
								
							
								
							
						 | 
						
							
							
								
								Finish renaming "context" to "room_id" in federation codebase
							
							
							
							
							
						 | 
						
							2015-01-16 19:01:03 +00:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								c06a9063e1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into pushers
							
							
							
							
							
						 | 
						
							2015-01-13 13:15:51 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								c9d2cecac9
								
							
								
							
						 | 
						
							
							
								
								SYN-231: User agent header broken
							
							
							
							
							
						 | 
						
							2015-01-08 09:41:11 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								adb04b1e57
								
							
								
							
						 | 
						
							
							
								
								Update copyright notices
							
							
							
							
							
						 | 
						
							2015-01-06 13:21:39 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								773de09774
								
							
								
							
						 | 
						
							
							
								
								Set a content-length for JSON responses
							
							
							
							
							
						 | 
						
							2015-01-06 13:05:19 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								24b5d01853
								
							
								
							
						 | 
						
							
							
								
								Include version in User-Agent and Server headers
							
							
							
							
							
						 | 
						
							2014-12-22 10:16:02 +00:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								b56730bb6e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into pushers
							
							
							
							
							
							
							
							Conflicts:
	synapse/api/errors.py
	synapse/server.py
	synapse/storage/__init__.py 
							
						 | 
						
							2014-12-18 15:15:22 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								1fc2a0e33e
								
							
								
							
						 | 
						
							
							
								
								Fix tests and remove debug logging
							
							
							
							
							
						 | 
						
							2014-12-12 15:08:29 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								7b43a503f3
								
							
								
							
						 | 
						
							
							
								
								Consistently url decode and decode as utf 8 the URL parts
							
							
							
							
							
						 | 
						
							2014-12-12 15:05:37 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								d80d505b1f
								
							
								
							
						 | 
						
							
							
								
								Limit the size of images that are thumbnailed serverside. Limit the size of file that a server will download from a remote server
							
							
							
							
							
						 | 
						
							2014-12-11 14:19:32 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								4f37c0ea9d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into media_repository
							
							
							
							
							
						 | 
						
							2014-12-10 16:55:06 +00:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								0f4dcab238
								
							
								
							
						 | 
						
							
							
								
								turn back on per-request transaction retries, so that every time we try to hit a dead server we actually end up hammering 5 times :|
							
							
							
							
							
						 | 
						
							2014-12-10 10:28:27 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								b8d30899b1
								
							
								
							
						 | 
						
							
							
								
								Code style.
							
							
							
							
							
						 | 
						
							2014-12-10 10:16:09 +00:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								faf12b64f8
								
							
								
							
						 | 
						
							
							
								
								add errbacks to enqueue_pdu deferreds; change logging for failed federation sends to warn rather than exception
							
							
							
							
							
						 | 
						
							2014-12-10 00:12:51 +00:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								2b1acb7671
								
							
								
							
						 | 
						
							
							
								
								squidge to 79 columns as per pep8
							
							
							
							
							
						 | 
						
							2014-12-10 00:03:55 +00:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								aed62a3583
								
							
								
							
						 | 
						
							
							
								
								track replication destination health, and perform exponential back-off when sending transactions. does *not* yet retry transactions, but drops them on the floor if waiting for a server to recover.
							
							
							
							
							
						 | 
						
							2014-12-07 02:26:07 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								c01fd5573c
								
							
								
							
						 | 
						
							
							
								
								Implement download support for media_repository
							
							
							
							
							
						 | 
						
							2014-12-04 14:22:31 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								5da65085d1
								
							
								
							
						 | 
						
							
							
								
								Get uploads working with new media repo
							
							
							
							
							
						 | 
						
							2014-12-02 19:51:47 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								279c48c8b4
								
							
								
							
						 | 
						
							
							
								
								Write the upload portion of version 1 of the media repository
							
							
							
							
							
						 | 
						
							2014-12-02 17:13:14 +00:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								7642d95d5e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into pushers
							
							
							
							
							
						 | 
						
							2014-12-02 13:50:05 +00:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								ae8ad55cb8
								
							
								
							
						 | 
						
							
							
								
								typos
							
							
							
							
							
						 | 
						
							2014-11-24 01:41:12 +00:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								eb6aedf92c
								
							
								
							
						 | 
						
							
							
								
								More work on pushers. Attempt to do HTTP pokes. Not sure if the actual HTTP pokes work or not yet but the retry semantics are pretty good.
							
							
							
							
							
						 | 
						
							2014-11-21 12:21:00 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								610c2ea131
								
							
								
							
						 | 
						
							
							
								
								Fix pep8 and pyflakes warnings
							
							
							
							
							
						 | 
						
							2014-11-20 18:00:10 +00:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								f1c7f8e813
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into http_client_refactor
							
							
							
							
							
						 | 
						
							2014-11-20 17:49:48 +00:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								e377d33652
								
							
								
							
						 | 
						
							
							
								
								Separate out the matrix http client completely because just about all of its code it now separate from the simple case we need for standard HTTP(S)
							
							
							
							
							
						 | 
						
							2014-11-20 17:41:56 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								db9ce032a4
								
							
								
							
						 | 
						
							
							
								
								Fix pep8 codestyle warnings
							
							
							
							
							
						 | 
						
							2014-11-20 17:26:36 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								dfdda2c871
								
							
								
							
						 | 
						
							
							
								
								Use module loggers rather than the root logger. Exceptions caused by bad clients shouldn't cause ERROR level logging. Fix sql logging to use 'repr' rather than 'str'
							
							
							
							
							
						 | 
						
							2014-11-20 17:10:37 +00:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								dc60eee50e
								
							
								
							
						 | 
						
							
							
								
								Refactor the HTTP clients a little.
							
							
							
							
							
						 | 
						
							2014-11-20 13:53:34 +00:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								cf66532ac1
								
							
								
							
						 | 
						
							
							
								
								CaptchaServerHttpClient should extend the base, not matrix http client.
							
							
							
							
							
						 | 
						
							2014-11-20 12:48:21 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								3e54d70ae2
								
							
								
							
						 | 
						
							
							
								
								SYN-141: Encode query params as UTF-8.
							
							
							
							
							
						 | 
						
							2014-11-18 19:43:08 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								e903c941cb
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into request_logging
							
							
							
							
							
							
							
							Conflicts:
	setup.py
	synapse/storage/_base.py
	synapse/util/async.py 
							
						 | 
						
							2014-11-14 11:16:50 +00:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								7df8c8c287
								
							
								
							
						 | 
						
							
							
								
								apply some cache headers to try to make the content repo less nutso
							
							
							
							
							
						 | 
						
							2014-11-11 05:36:39 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								7c06399512
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into request_logging
							
							
							
							
							
							
							
							Conflicts:
	synapse/config/logger.py 
							
						 | 
						
							2014-10-30 11:13:58 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								7d709542ca
								
							
								
							
						 | 
						
							
							
								
								Fix pep8 warnings
							
							
							
							
							
						 | 
						
							2014-10-30 11:10:17 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								b29517bd01
								
							
								
							
						 | 
						
							
							
								
								Add a request-id to each log line
							
							
							
							
							
						 | 
						
							2014-10-30 01:21:33 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								4be99c2989
								
							
								
							
						 | 
						
							
							
								
								Add get_json method to 3pid http client. Better logging for errors in 3pid requests
							
							
							
							
							
						 | 
						
							2014-10-20 14:10:08 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								f74e850b5c
								
							
								
							
						 | 
						
							
							
								
								remove debugging logging for signing requests
							
							
							
							
							
						 | 
						
							2014-10-14 11:46:13 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								6684855767
								
							
								
							
						 | 
						
							
							
								
								Verify signatures for server2server requests
							
							
							
							
							
						 | 
						
							2014-10-13 14:37:46 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								10ef8e6e4b
								
							
								
							
						 | 
						
							
							
								
								SYN-75 sign at the request level rather than the transaction level
							
							
							
							
							
						 | 
						
							2014-10-13 11:49:55 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								cecda27d73
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into server2server_signing
							
							
							
							
							
						 | 
						
							2014-10-13 11:06:36 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								984e207b59
								
							
								
							
						 | 
						
							
							
								
								Merge branch develop into server2server_signing
							
							
							
							
							
							
							
							Conflicts:
	synapse/app/homeserver.py 
							
						 | 
						
							2014-10-13 10:58:50 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								693d0b8f45
								
							
								
							
						 | 
						
							
							
								
								Replace on_send_callback with something a bit clearer so that we can sign messages
							
							
							
							
							
						 | 
						
							2014-10-13 10:49:04 +01:00 |