Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							83c53113af 
							
						 
					 
					
						
						
							
							Break a test.  
						
						
						
						
					 
					
						2014-10-09 15:51:05 +01:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							d224358e21 
							
						 
					 
					
						
						
							
							Restructure specification sections.  
						
						
						
						
					 
					
						2014-10-09 11:08:06 +01:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							72aef114ab 
							
						 
					 
					
						
						
							
							Fix unit test.  
						
						
						
						
					 
					
						2014-10-08 15:18:19 +01:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							6045bd89fb 
							
						 
					 
					
						
						
							
							Break unit test.  
						
						
						
						
					 
					
						2014-10-08 15:16:03 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							5b096cc3db 
							
						 
					 
					
						
						
							
							Merge pull request  #7  from matrix-org/paul/doc  
						
						... 
						
						
						
						Clarify that room alias domain names will be server-scoped; nonlocal edi... 
						
						
					 
					
						2014-10-07 16:35:32 +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 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							c72074b48e 
							
						 
					 
					
						
						
							
							Clarify how-to some more.  
						
						
						
						
					 
					
						2014-10-06 14:57:26 +01:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							3ef2c946d5 
							
						 
					 
					
						
						
							
							Update JSFiddles/how-to to support the new registration format.  
						
						
						
						
					 
					
						2014-10-06 14:52:46 +01:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							aaf1d499bf 
							
						 
					 
					
						
						
							
							Add more section headings.  
						
						
						
						
					 
					
						2014-10-06 13:18:52 +01:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							94982392be 
							
						 
					 
					
						
						
							
							Clarify room permission / power level information.  
						
						
						
						
					 
					
						2014-10-06 12:41:48 +01:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							78a3f43d9d 
							
						 
					 
					
						
						
							
							swagger: Added DELETE method for directory server.  
						
						
						
						
					 
					
						2014-10-06 09:23:19 +01:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							02a44664b9 
							
						 
					 
					
						
						
							
							More spec work.  
						
						
						
						
					 
					
						2014-10-03 17:38:30 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							ca0e8dedfb 
							
						 
					 
					
						
						
							
							Clarify how m.room.alias event works  
						
						
						
						
					 
					
						2014-10-03 14:45:42 +01:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							ba11afafb9 
							
						 
					 
					
						
						
							
							Flesh out room alias section.  
						
						
						
						
					 
					
						2014-10-03 14:39:58 +01:00 
						 
				 
			
				
					
						
							
							
								Kegan Dougal 
							
						 
					 
					
						
						
						
						
							
						
						
							7e1437c6b1 
							
						 
					 
					
						
						
							
							Add more information to TODOs. Explain m.room.join_rules.  
						
						
						
						
					 
					
						2014-10-03 10:34:29 +01:00 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							1aa5cc9178 
							
						 
					 
					
						
						
							
							Federation protocol URLs should have an H2 heading, not H1  
						
						
						
						
					 
					
						2014-10-02 18:11:04 +01:00 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							bc1d685a8c 
							
						 
					 
					
						
						
							
							Remove TODO note about VoIP events as they now have their own entire section  
						
						
						
						
					 
					
						2014-10-02 18:00:31 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							f6b9853ad0 
							
						 
					 
					
						
						
							
							Merge pull request  #5  from matrix-org/paul/doc  
						
						... 
						
						
						
						Document the Profile system 
						
						
					 
					
						2014-10-02 17:37:21 +01:00 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							de38f54f22 
							
						 
					 
					
						
						
							
							Document the Profile system  
						
						
						
						
					 
					
						2014-10-02 17:18:32 +01:00 
						 
				 
			
				
					
						
							
							
								Paul Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							96213f69a2 
							
						 
					 
					
						
						
							
							Merge pull request  #4  from matrix-org/erikj-spec-changes  
						
						... 
						
						
						
						Erikj spec changes 
						
						
					 
					
						2014-10-02 14:46:40 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							036333412d 
							
						 
					 
					
						
						
							
							Add todo notes  
						
						
						
						
					 
					
						2014-10-02 14:38:53 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							82e278029c 
							
						 
					 
					
						
						
							
							Remove incorrect reasons for empty PDU lists.  
						
						
						
						
					 
					
						2014-10-02 14:38:22 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							b9cdc443d7 
							
						 
					 
					
						
						
							
							Fix pyflakes errors  
						
						
						
						
					 
					
						2014-10-02 14:37:30 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							1561ef56ed 
							
						 
					 
					
						
						
							
							Remove note about assymetry of having left a room.  
						
						... 
						
						
						
						Currently, if you leave a room you still appear in the members list.
This is basically a bug with the current implementation/spec, rather
than something that should happen. 
						
						
					 
					
						2014-10-02 14:35:39 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							f368ad946e 
							
						 
					 
					
						
						
							
							m.room.ops_levels includes redact_level  
						
						
						
						
					 
					
						2014-10-02 14:33:26 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							918e71adb7 
							
						 
					 
					
						
						
							
							Don't use spaces in example room alias  
						
						
						
						
					 
					
						2014-10-02 14:31:21 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							cf3188352b 
							
						 
					 
					
						
						
							
							Fix default value and key names.  
						
						
						
						
					 
					
						2014-10-02 14:30:25 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							6860a18c12 
							
						 
					 
					
						
						
							
							Be less alarmist about not using an ID server.  
						
						
						
						
					 
					
						2014-10-02 14:27:35 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							ff553cc9dd 
							
						 
					 
					
						
						
							
							Alias lookups return a server list.  
						
						
						
						
					 
					
						2014-10-02 14:26:58 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							574377636e 
							
						 
					 
					
						
						
							
							Add a keyword argument to get_json to avoid retrying on DNS failures. Rather than passing MatrixHttpClient.RETRY_DNS_LOOKUP_FAILURES as a fake query string parameter  
						
						
						
						
					 
					
						2014-10-02 14:26:13 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							b2d41b1cd9 
							
						 
					 
					
						
						
							
							All room state is currently shared.  
						
						
						
						
					 
					
						2014-10-02 14:25:47 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							9435830351 
							
						 
					 
					
						
						
							
							Merge branch 'master' into develop  
						
						
						
						
					 
					
						2014-10-02 14:11:17 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							d694619a95 
							
						 
					 
					
						
						
							
							Fix ncorrect ports in documentation and add notes on how generate-config also generates certs bound to whatever hostname you give with --generate-config.  
						
						... 
						
						
						
						SYN-87 #resolved 
						
						
					 
					
						2014-10-02 14:09:27 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							4f11518934 
							
						 
					 
					
						
						
							
							Split PlainHttpClient into separate clients for talking to Identity servers and talking to Capatcha servers  
						
						
						
						
					 
					
						2014-10-02 14:03:26 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							2d55d43d40 
							
						 
					 
					
						
						
							
							Merge branch 'master' into develop  
						
						
						
						
					 
					
						2014-10-02 11:03:13 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							45f7677bdc 
							
						 
					 
					
						
						
							
							Trivial formatting fixes for README.  
						
						
						
						
					 
					
						2014-10-02 11:00:21 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							099083ea6b 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into develop  
						
						
						
						
					 
					
						2014-10-02 10:46:41 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							7a322b6326 
							
						 
					 
					
						
						
							
							Update README setup instructions to be correct. Make synapse spit out explanatory note when generating config to tell people to look at it and customise it.  
						
						
						
						
					 
					
						2014-10-02 10:43:22 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							d1adb19b8a 
							
						 
					 
					
						
						
							
							Re-apply a0b1b34c71e46304f7024f0570db92f4577303b5 to master (fixing synctl)  
						
						
						
						
					 
					
						2014-10-02 10:38:11 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							a0b1b34c71 
							
						 
					 
					
						
						
							
							Make instructions synctl gives for generateing a config file actuall generate a config file. Also, make synctil run synapse correctly by invoking a module such that the path is correct to pull in other bits from the working directory rather than requiring them to be on the PYTHONPATH (which would lead to people being very confused when they edit source in the working directory and their changes do not take effect).  
						
						
						
						
					 
					
						2014-10-02 09:55:26 +01:00 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							bf8b9b90cd 
							
						 
					 
					
						
						
							
							Added a TODO-doc marker about the presence timing system  
						
						
						
						
					 
					
						2014-10-01 19:37:18 +01:00 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							c5757a0266 
							
						 
					 
					
						
						
							
							Define the client and server APIs for Presence  
						
						
						
						
					 
					
						2014-10-01 19:35:13 +01:00 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							ee447abcad 
							
						 
					 
					
						
						
							
							Continue moving content out of docs/model/presence into the main spec; delete model docs that are duplicated  
						
						
						
						
					 
					
						2014-10-01 18:34:08 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							a940a87ddc 
							
						 
					 
					
						
						
							
							SPEC-25: Add details on how to prune redacted events.  
						
						... 
						
						
						
						SPEC-25 #comment I've added the details of what the server should do on
receipt of a redaction event. In reality it can do whatever it wants,
and its probably a reasonable implementation to flag it up to a server
admin for verification before actually redacting an event. 
						
						
					 
					
						2014-10-01 18:18:44 +01:00 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							5813e81dc6 
							
						 
					 
					
						
						
							
							Move documented but-unimplemented 'presence idle times' into a new document to contain such features  
						
						
						
						
					 
					
						2014-10-01 17:59:55 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							a6d3be4dbf 
							
						 
					 
					
						
						
							
							s/m.room.redacted/m.room.redaction/  
						
						
						
						
					 
					
						2014-10-01 17:55:31 +01:00