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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								82e278029c 
								
							
								 
							
						 
						
							
							
								
								Remove incorrect reasons for empty PDU lists.  
							
							
							
						 
						
							2014-10-02 14:38:22 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								f368ad946e 
								
							
								 
							
						 
						
							
							
								
								m.room.ops_levels includes redact_level  
							
							
							
						 
						
							2014-10-02 14:33:26 +01:00  
				
					
						
							
							
								 
						
							
							
								918e71adb7 
								
							
								 
							
						 
						
							
							
								
								Don't use spaces in example room alias  
							
							
							
						 
						
							2014-10-02 14:31:21 +01:00  
				
					
						
							
							
								 
						
							
							
								cf3188352b 
								
							
								 
							
						 
						
							
							
								
								Fix default value and key names.  
							
							
							
						 
						
							2014-10-02 14:30:25 +01:00  
				
					
						
							
							
								 
						
							
							
								6860a18c12 
								
							
								 
							
						 
						
							
							
								
								Be less alarmist about not using an ID server.  
							
							
							
						 
						
							2014-10-02 14:27:35 +01:00  
				
					
						
							
							
								 
						
							
							
								ff553cc9dd 
								
							
								 
							
						 
						
							
							
								
								Alias lookups return a server list.  
							
							
							
						 
						
							2014-10-02 14:26:58 +01:00  
				
					
						
							
							
								 
						
							
							
								b2d41b1cd9 
								
							
								 
							
						 
						
							
							
								
								All room state is currently shared.  
							
							
							
						 
						
							2014-10-02 14:25:47 +01:00  
				
					
						
							
							
								 
						
							
							
								bf8b9b90cd 
								
							
								 
							
						 
						
							
							
								
								Added a TODO-doc marker about the presence timing system  
							
							
							
						 
						
							2014-10-01 19:37:18 +01:00  
				
					
						
							
							
								 
						
							
							
								c5757a0266 
								
							
								 
							
						 
						
							
							
								
								Define the client and server APIs for Presence  
							
							
							
						 
						
							2014-10-01 19:35:13 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								5813e81dc6 
								
							
								 
							
						 
						
							
							
								
								Move documented but-unimplemented 'presence idle times' into a new document to contain such features  
							
							
							
						 
						
							2014-10-01 17:59:55 +01:00  
				
					
						
							
							
								 
						
							
							
								a6d3be4dbf 
								
							
								 
							
						 
						
							
							
								
								s/m.room.redacted/m.room.redaction/  
							
							
							
						 
						
							2014-10-01 17:55:31 +01:00  
				
					
						
							
							
								 
						
							
							
								166bec0c08 
								
							
								 
							
						 
						
							
							
								
								Nuke the entire 'Typing Notifications' spec section given as they don't exist yet in the implementation  
							
							
							
						 
						
							2014-10-01 17:33:18 +01:00  
				
					
						
							
							
								 
						
							
							
								392dc8af59 
								
							
								 
							
						 
						
							
							
								
								Annotate all the 'TODO' marks as relating to either the specification itself or the documentation thereof  
							
							
							
						 
						
							2014-09-30 18:11:24 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								1f76377a7c 
								
							
								 
							
						 
						
							
							
								
								Re-wrap content after latest additions  
							
							
							
						 
						
							2014-09-29 18:40:15 +01:00  
				
					
						
							
							
								 
						
							
							
								dca75a08ba 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into develop  
							
							
							
						 
						
							2014-09-29 18:37:28 +01:00  
				
					
						
							
							
								 
						
							
							
								2d61dbc774 
								
							
								 
							
						 
						
							
							
								
								Extended docs about the registration/login flows  
							
							
							
						 
						
							2014-09-29 18:36:10 +01:00  
				
					
						
							
							
								 
						
							
							
								3ee9a67aa4 
								
							
								 
							
						 
						
							
							
								
								Reörder the specification sections, to move 'Registration and Login' first, where it logically belongs  
							
							
							
						 
						
							2014-09-29 18:36:10 +01:00  
				
					
						
							
							
								 
						
							
							
								ae953b0884 
								
							
								 
							
						 
						
							
							
								
								Huge whitespace hackery - reflow all (content) paragraphs at tw=80  
							
							
							
						 
						
							2014-09-29 18:36:10 +01:00  
				
					
						
							
							
								 
						
							
							
								d5bf210998 
								
							
								 
							
						 
						
							
							
								
								No longer need the Freenode verification key file  
							
							
							
						 
						
							2014-09-29 18:36:10 +01:00  
				
					
						
							
							
								 
						
							
							
								389285585d 
								
							
								 
							
						 
						
							
							
								
								Add a 'Redactions' section.  
							
							
							
						 
						
							2014-09-29 17:19:45 +01:00  
				
					
						
							
							
								 
						
							
							
								3656eb4740 
								
							
								 
							
						 
						
							
							
								
								Add m.room.redacted in events list  
							
							
							
						 
						
							2014-09-29 16:39:08 +01:00  
				
					
						
							
							
								 
						
							
							
								472ef19100 
								
							
								 
							
						 
						
							
							
								
								No longer need the Freenode verification key file  
							
							
							
						 
						
							2014-09-29 14:22:21 +01:00  
				
					
						
							
							
								 
						
							
							
								ec5fb77a66 
								
							
								 
							
						 
						
							
							
								
								Just use a yaml list for turn servers  
							
							
							
						 
						
							2014-09-25 19:18:32 +02:00  
				
					
						
							
							
								 
						
							
							
								6e72ee62ae 
								
							
								 
							
						 
						
							
							
								
								Add realm to coturn options (it needs it).  
							
							
							
						 
						
							2014-09-25 17:21:52 +01:00  
				
					
						
							
							
								 
						
							
							
								48ea055781 
								
							
								 
							
						 
						
							
							
								
								fix rst warnings  
							
							
							
						 
						
							2014-09-25 17:01:27 +01:00