e60353c4a0 
								
							
								 
							
						 
						
							
							
								
								Fix YAML syntax of turn config example  
							
							
							
						 
						
							2015-02-24 19:34:21 +00:00  
				
					
						
							
							
								 
						
							
							
								1eb319806b 
								
							
								 
							
						 
						
							
							
								
								clarify these instructions a media-repo specific  
							
							
							
						 
						
							2014-12-24 16:56:32 +00:00  
				
					
						
							
							
								 
						
							
							
								4f37c0ea9d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into media_repository  
							
							
							
						 
						
							2014-12-10 16:55:06 +00:00  
				
					
						
							
							
								 
						
							
							
								7f193b9958 
								
							
								 
							
						 
						
							
							
								
								update media repository implementation docs  
							
							
							
						 
						
							2014-12-10 16:54:37 +00:00  
				
					
						
							
							
								 
						
							
							
								8ffbb52eee 
								
							
								 
							
						 
						
							
							
								
								oops  
							
							
							
						 
						
							2014-12-10 13:43:34 +00:00  
				
					
						
							
							
								 
						
							
							
								32bc2b4fc1 
								
							
								 
							
						 
						
							
							
								
								update codestyle based on debate on #matrix-dev  
							
							
							
						 
						
							2014-12-10 13:11:43 +00:00  
				
					
						
							
							
								 
						
							
							
								279c48c8b4 
								
							
								 
							
						 
						
							
							
								
								Write the upload portion of version 1 of the media repository  
							
							
							
						 
						
							2014-12-02 17:13:14 +00:00  
				
					
						
							
							
								 
						
							
							
								33e9e0fb2d 
								
							
								 
							
						 
						
							
							
								
								move model/ into matrix-doc/drafts  
							
							
							
						 
						
							2014-11-12 01:16:38 +02:00  
				
					
						
							
							
								 
						
							
							
								ef1eb4c888 
								
							
								 
							
						 
						
							
							
								
								this got merged into matrix-doc/specification/00_basis.rst by someone  
							
							
							
						 
						
							2014-11-12 01:14:06 +02:00  
				
					
						
							
							
								 
						
							
							
								0ac2dc388e 
								
							
								 
							
						 
						
							
							
								
								move OLD_specification into matrix-doc/drafts  
							
							
							
						 
						
							2014-11-12 01:04:32 +02:00  
				
					
						
							
							
								 
						
							
							
								a0bc0fdf21 
								
							
								 
							
						 
						
							
							
								
								vestigial readme for sphinx  
							
							
							
						 
						
							2014-11-12 00:18:26 +02:00  
				
					
						
							
							
								 
						
							
							
								774cff3c72 
								
							
								 
							
						 
						
							
							
								
								move swagger impl to matrix-doc  
							
							
							
						 
						
							2014-11-12 00:18:25 +02:00  
				
					
						
							
							
								 
						
							
							
								0c59bc5e35 
								
							
								 
							
						 
						
							
							
								
								move stuff out of implementation-notes - /everything/ here should be implementation-notes now  
							
							
							
						 
						
							2014-11-12 00:18:25 +02:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								b6c48a694b 
								
							
								 
							
						 
						
							
							
								
								haven't i already moved you to matrix-doc twice? :/  
							
							
							
						 
						
							2014-11-12 00:18:25 +02:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								bebca337c4 
								
							
								 
							
						 
						
							
							
								
								this has been merged into matrix-doc/specification/30_server_server_api.rst  
							
							
							
						 
						
							2014-11-12 00:17:05 +02:00  
				
					
						
							
							
								 
						
							
							
								a8ceeec0fd 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #12  from matrix-org/federation_authorization  
							
							... 
							
							
							
							Federation authorization 
							
						 
						
							2014-11-11 16:40:50 +00:00  
				
					
						
							
							
								 
						
							
							
								303b455965 
								
							
								 
							
						 
						
							
							
								
								trivial spacing fix  
							
							
							
						 
						
							2014-11-11 04:39:30 +00:00  
				
					
						
							
							
								 
						
							
							
								f45a6a7004 
								
							
								 
							
						 
						
							
							
								
								Fix RST sublist formatting bug  
							
							
							
						 
						
							2014-11-10 22:07:08 +00:00  
				
					
						
							
							
								 
						
							
							
								f987393b32 
								
							
								 
							
						 
						
							
							
								
								moar boxes.  
							
							
							
						 
						
							2014-11-10 21:56:52 +00:00  
				
					
						
							
							
								 
						
							
							
								0b51d970b4 
								
							
								 
							
						 
						
							
							
								
								document up the current architecture a bit based on the workshop the other week  
							
							
							
						 
						
							2014-11-10 18:43:16 +00:00  
				
					
						
							
							
								 
						
							
							
								acb2d171e8 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into event_signing  
							
							
							
						 
						
							2014-10-27 11:14:11 +00:00  
				
					
						
							
							
								 
						
							
							
								a065becea5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'docs-restructuring' of github.com:matrix-org/synapse into develop  
							
							
							
						 
						
							2014-10-17 20:18:02 +01:00  
				
					
						
							
							
								 
						
							
							
								c5cec1cc77 
								
							
								 
							
						 
						
							
							
								
								Rename 'meta' to 'unsigned'  
							
							
							
						 
						
							2014-10-17 16:50:04 +01:00  
				
					
						
							
							
								 
						
							
							
								c18a6433d4 
								
							
								 
							
						 
						
							
							
								
								typoe  
							
							
							
						 
						
							2014-10-13 23:24:14 +01:00  
				
					
						
							
							
								 
						
							
							
								984e207b59 
								
							
								 
							
						 
						
							
							
								
								Merge branch develop into server2server_signing  
							
							... 
							
							
							
							Conflicts:
	synapse/app/homeserver.py 
							
						 
						
							2014-10-13 10:58:50 +01:00  
				
					
						
							
							
								 
						
							
							
								259b5e8451 
								
							
								 
							
						 
						
							
							
								
								move swagger JSON from synapse project to matrix-doc project  
							
							
							
						 
						
							2014-10-09 20:43:07 +02:00  
				
					
						
							
							
								 
						
							
							
								e1170d4edb 
								
							
								 
							
						 
						
							
							
								
								move matrix-generic content to new matrix-doc git project  
							
							
							
						 
						
							2014-10-09 20:38:00 +02:00  
				
					
						
							
							
								 
						
							
							
								81b956c70d 
								
							
								 
							
						 
						
							
							
								
								Add spec-additions.rst with info on recaptcha and common event fields.  
							
							
							
						 
						
							2014-10-09 18:08:19 +01:00  
				
					
						
							
							
								 
						
							
							
								d224358e21 
								
							
								 
							
						 
						
							
							
								
								Restructure specification sections.  
							
							
							
						 
						
							2014-10-09 11:08:06 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								9ac53ef8cf 
								
							
								 
							
						 
						
							
							
								
								SPEC-3: First hack at defining some of the various event related concepts  
							
							
							
						 
						
							2014-10-07 11:38:02 +01:00  
				
					
						
							
							
								 
						
							
							
								2fc00508fb 
								
							
								 
							
						 
						
							
							
								
								Add quick and dirty doc about state resolution  
							
							
							
						 
						
							2014-10-06 17:34:44 +01:00  
				
					
						
							
							
								 
						
							
							
								c72074b48e 
								
							
								 
							
						 
						
							
							
								
								Clarify how-to some more.  
							
							
							
						 
						
							2014-10-06 14:57:26 +01:00  
				
					
						
							
							
								 
						
							
							
								3ef2c946d5 
								
							
								 
							
						 
						
							
							
								
								Update JSFiddles/how-to to support the new registration format.  
							
							
							
						 
						
							2014-10-06 14:52:46 +01:00  
				
					
						
							
							
								 
						
							
							
								aaf1d499bf 
								
							
								 
							
						 
						
							
							
								
								Add more section headings.  
							
							
							
						 
						
							2014-10-06 13:18:52 +01:00  
				
					
						
							
							
								 
						
							
							
								94982392be 
								
							
								 
							
						 
						
							
							
								
								Clarify room permission / power level information.  
							
							
							
						 
						
							2014-10-06 12:41:48 +01:00  
				
					
						
							
							
								 
						
							
							
								51276c60bf 
								
							
								 
							
						 
						
							
							
								
								Add information about the initialSync API.  
							
							... 
							
							
							
							Outline and describe the keys from the initial sync API. Hide room-scoped
initial sync API for now as it is not implemented and needs more thought before
it can be specced. 
							
						 
						
							2014-10-06 10:32:04 +01:00  
				
					
						
							
							
								 
						
							
							
								78a3f43d9d 
								
							
								 
							
						 
						
							
							
								
								swagger: Added DELETE method for directory server.  
							
							
							
						 
						
							2014-10-06 09:23:19 +01:00  
				
					
						
							
							
								 
						
							
							
								02a44664b9 
								
							
								 
							
						 
						
							
							
								
								More spec work.  
							
							
							
						 
						
							2014-10-03 17:38:30 +01:00  
				
					
						
							
							
								 
						
							
							
								1fa0454288 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6  from matrix-org/paul/doc  
							
							... 
							
							
							
							Clarify how m.room.alias event works 
							
						 
						
							2014-10-03 14:50:08 +01:00  
				
					
						
							
							
								 
						
							
							
								ca0e8dedfb 
								
							
								 
							
						 
						
							
							
								
								Clarify how m.room.alias event works  
							
							
							
						 
						
							2014-10-03 14:45:42 +01:00  
				
					
						
							
							
								 
						
							
							
								ba11afafb9 
								
							
								 
							
						 
						
							
							
								
								Flesh out room alias section.  
							
							
							
						 
						
							2014-10-03 14:39:58 +01:00  
				
					
						
							
							
								 
						
							
							
								7e1437c6b1 
								
							
								 
							
						 
						
							
							
								
								Add more information to TODOs. Explain m.room.join_rules.  
							
							
							
						 
						
							2014-10-03 10:34:29 +01:00  
				
					
						
							
							
								 
						
							
							
								1aa5cc9178 
								
							
								 
							
						 
						
							
							
								
								Federation protocol URLs should have an H2 heading, not H1  
							
							
							
						 
						
							2014-10-02 18:11:04 +01:00  
				
					
						
							
							
								 
						
							
							
								bc1d685a8c 
								
							
								 
							
						 
						
							
							
								
								Remove TODO note about VoIP events as they now have their own entire section  
							
							
							
						 
						
							2014-10-02 18:00:31 +01:00  
				
					
						
							
							
								 
						
							
							
								f6b9853ad0 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5  from matrix-org/paul/doc  
							
							... 
							
							
							
							Document the Profile system 
							
						 
						
							2014-10-02 17:37:21 +01:00  
				
					
						
							
							
								 
						
							
							
								de38f54f22 
								
							
								 
							
						 
						
							
							
								
								Document the Profile system  
							
							
							
						 
						
							2014-10-02 17:18:32 +01:00  
				
					
						
							
							
								 
						
							
							
								036333412d 
								
							
								 
							
						 
						
							
							
								
								Add todo notes  
							
							
							
						 
						
							2014-10-02 14:38:53 +01:00