Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								d79ffa1898
								
							
								
							
						 | 
						
							
							
								
								typo
							
							
							
							
							
						 | 
						
							2015-05-09 14:45:37 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								22a7ba8b22
								
							
								
							
						 | 
						
							
							
								
								Actually rename all isntances
							
							
							
							
							
						 | 
						
							2015-05-08 13:50:03 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								3a42f32134
								
							
								
							
						 | 
						
							
							
								
								Reword port script usage
							
							
							
							
							
						 | 
						
							2015-05-08 13:47:48 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								6101ce427a
								
							
								
							
						 | 
						
							
							
								
								Slight rewording
							
							
							
							
							
						 | 
						
							2015-05-07 18:58:28 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								5fe26a9b5c
								
							
								
							
						 | 
						
							
							
								
								Reword docs/application_services.rst
							
							
							
							
							
						 | 
						
							2015-05-07 18:54:53 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								35698484a5
								
							
								
							
						 | 
						
							
							
								
								Add some information on registering AS's
							
							
							
							
							
						 | 
						
							2015-05-07 18:51:09 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								938939fd89
								
							
								
							
						 | 
						
							
							
								
								Move CAPTCHA_SETUP to docs/
							
							
							
							
							
						 | 
						
							2015-05-06 13:48:06 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								32937f3ea0
								
							
								
							
						 | 
						
							
							
								
								database config is not kept in separate config file anymore
							
							
							
							
							
						 | 
						
							2015-05-01 14:06:54 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								72443572bf
								
							
								
							
						 | 
						
							
							
								
								Mention that postgres databases must have the correct charset encoding
							
							
							
							
							
						 | 
						
							2015-04-29 11:50:33 +01:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								478e511db0
								
							
								
							
						 | 
						
							
							
								
								improve postgres blurb a bit
							
							
							
							
							
						 | 
						
							2015-04-29 00:48:07 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								cc52f02d74
								
							
								
							
						 | 
						
							
							
								
								Fix rst
							
							
							
							
							
						 | 
						
							2015-04-28 18:09:20 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								3151afee9e
								
							
								
							
						 | 
						
							
							
								
								Update docs/postgres.rst to explain port script usage
							
							
							
							
							
						 | 
						
							2015-04-28 17:59:27 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								56f518d279
								
							
								
							
						 | 
						
							
							
								
								Add docs on how to use synapse with psycopg2
							
							
							
							
							
						 | 
						
							2015-04-27 14:53:35 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								6d15401341
								
							
								
							
						 | 
						
							
							
								
								Mumble ReST mumble ``fixed-width`` mumble
							
							
							
							
							
						 | 
						
							2015-04-23 16:16:08 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								8c78414284
								
							
								
							
						 | 
						
							
							
								
								Formatting / wording fixes to metrics doc
							
							
							
							
							
						 | 
						
							2015-04-23 16:14:08 +01:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								6c99491347
								
							
								
							
						 | 
						
							
							
								
								prometheus/metrics howto from Leo
							
							
							
							
							
						 | 
						
							2015-04-23 16:08:08 +01:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								e60353c4a0
								
							
								
							
						 | 
						
							
							
								
								Fix YAML syntax of turn config example
							
							
							
							
							
						 | 
						
							2015-02-24 19:34:21 +00:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								1eb319806b
								
							
								
							
						 | 
						
							
							
								
								clarify these instructions a media-repo specific
							
							
							
							
							
						 | 
						
							2014-12-24 16:56:32 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								4f37c0ea9d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into media_repository
							
							
							
							
							
						 | 
						
							2014-12-10 16:55:06 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								7f193b9958
								
							
								
							
						 | 
						
							
							
								
								update media repository implementation docs
							
							
							
							
							
						 | 
						
							2014-12-10 16:54:37 +00:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								8ffbb52eee
								
							
								
							
						 | 
						
							
							
								
								oops
							
							
							
							
							
						 | 
						
							2014-12-10 13:43:34 +00:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								32bc2b4fc1
								
							
								
							
						 | 
						
							
							
								
								update codestyle based on debate on #matrix-dev
							
							
							
							
							
						 | 
						
							2014-12-10 13:11:43 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								279c48c8b4
								
							
								
							
						 | 
						
							
							
								
								Write the upload portion of version 1 of the media repository
							
							
							
							
							
						 | 
						
							2014-12-02 17:13:14 +00:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								33e9e0fb2d
								
							
								
							
						 | 
						
							
							
								
								move model/ into matrix-doc/drafts
							
							
							
							
							
						 | 
						
							2014-11-12 01:16:38 +02:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								ef1eb4c888
								
							
								
							
						 | 
						
							
							
								
								this got merged into matrix-doc/specification/00_basis.rst by someone
							
							
							
							
							
						 | 
						
							2014-11-12 01:14:06 +02:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								0ac2dc388e
								
							
								
							
						 | 
						
							
							
								
								move OLD_specification into matrix-doc/drafts
							
							
							
							
							
						 | 
						
							2014-11-12 01:04:32 +02:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								a0bc0fdf21
								
							
								
							
						 | 
						
							
							
								
								vestigial readme for sphinx
							
							
							
							
							
						 | 
						
							2014-11-12 00:18:26 +02:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								774cff3c72
								
							
								
							
						 | 
						
							
							
								
								move swagger impl to matrix-doc
							
							
							
							
							
						 | 
						
							2014-11-12 00:18:25 +02:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								0c59bc5e35
								
							
								
							
						 | 
						
							
							
								
								move stuff out of implementation-notes - /everything/ here should be implementation-notes now
							
							
							
							
							
						 | 
						
							2014-11-12 00:18:25 +02:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								7e1779d48c
								
							
								
							
						 | 
						
							
							
								
								this is ancient and has been moved to matrix-doc/drafts/federated_versioning_design_notes.rst
							
							
							
							
							
						 | 
						
							2014-11-12 00:18:25 +02:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								b6c48a694b
								
							
								
							
						 | 
						
							
							
								
								haven't i already moved you to matrix-doc twice? :/
							
							
							
							
							
						 | 
						
							2014-11-12 00:18:25 +02:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								216d5f6b52
								
							
								
							
						 | 
						
							
							
								
								this is obsolete and lives in matrix-doc in specification/30_server_server_api.rst now
							
							
							
							
							
						 | 
						
							2014-11-12 00:17:06 +02:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								bebca337c4
								
							
								
							
						 | 
						
							
							
								
								this has been merged into matrix-doc/specification/30_server_server_api.rst
							
							
							
							
							
						 | 
						
							2014-11-12 00:17:05 +02:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								a8ceeec0fd
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #12 from matrix-org/federation_authorization
							
							
							
							
							
							
							
							Federation authorization 
							
						 | 
						
							2014-11-11 16:40:50 +00:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								303b455965
								
							
								
							
						 | 
						
							
							
								
								trivial spacing fix
							
							
							
							
							
						 | 
						
							2014-11-11 04:39:30 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								f45a6a7004
								
							
								
							
						 | 
						
							
							
								
								Fix RST sublist formatting bug
							
							
							
							
							
						 | 
						
							2014-11-10 22:07:08 +00:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								f987393b32
								
							
								
							
						 | 
						
							
							
								
								moar boxes.
							
							
							
							
							
						 | 
						
							2014-11-10 21:56:52 +00:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								0b51d970b4
								
							
								
							
						 | 
						
							
							
								
								document up the current architecture a bit based on the workshop the other week
							
							
							
							
							
						 | 
						
							2014-11-10 18:43:16 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								acb2d171e8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into event_signing
							
							
							
							
							
						 | 
						
							2014-10-27 11:14:11 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								a065becea5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'docs-restructuring' of github.com:matrix-org/synapse into develop
							
							
							
							
							
						 | 
						
							2014-10-17 20:18:02 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								c5cec1cc77
								
							
								
							
						 | 
						
							
							
								
								Rename 'meta' to 'unsigned'
							
							
							
							
							
						 | 
						
							2014-10-17 16:50:04 +01:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								c18a6433d4
								
							
								
							
						 | 
						
							
							
								
								typoe
							
							
							
							
							
						 | 
						
							2014-10-13 23:24:14 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								984e207b59
								
							
								
							
						 | 
						
							
							
								
								Merge branch develop into server2server_signing
							
							
							
							
							
							
							
							Conflicts:
	synapse/app/homeserver.py 
							
						 | 
						
							2014-10-13 10:58:50 +01:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								259b5e8451
								
							
								
							
						 | 
						
							
							
								
								move swagger JSON from synapse project to matrix-doc project
							
							
							
							
							
						 | 
						
							2014-10-09 20:43:07 +02:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								e1170d4edb
								
							
								
							
						 | 
						
							
							
								
								move matrix-generic content to new matrix-doc git project
							
							
							
							
							
						 | 
						
							2014-10-09 20:38:00 +02:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								81b956c70d
								
							
								
							
						 | 
						
							
							
								
								Add spec-additions.rst with info on recaptcha and common event fields.
							
							
							
							
							
						 | 
						
							2014-10-09 18:08:19 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								d224358e21
								
							
								
							
						 | 
						
							
							
								
								Restructure specification sections.
							
							
							
							
							
						 | 
						
							2014-10-09 11:08:06 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								917af4705b
								
							
								
							
						 | 
						
							
							
								
								Clarify that room alias domain names will be server-scoped; nonlocal edits are unliekly to work but nonlocal lookups will
							
							
							
							
							
						 | 
						
							2014-10-07 16:23:12 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								9ac53ef8cf
								
							
								
							
						 | 
						
							
							
								
								SPEC-3: First hack at defining some of the various event related concepts
							
							
							
							
							
						 | 
						
							2014-10-07 11:38:02 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								2fc00508fb
								
							
								
							
						 | 
						
							
							
								
								Add quick and dirty doc about state resolution
							
							
							
							
							
						 | 
						
							2014-10-06 17:34:44 +01:00 |