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 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							c8d67beb9c 
							
						 
					 
					
						
						
							
							remove "red", "blue" and "green" server_name mappings  
						
						
						
						
							
						
					 
					
						2014-10-01 15:52:07 +01:00 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							b95a178584 
							
						 
					 
					
						
						
							
							SYN-75 Verify signatures on server to server transactions  
						
						
						
						
							
						
					 
					
						2014-09-30 15:15:10 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							fbf6320614 
							
						 
					 
					
						
						
							
							pyflakes cleanup  
						
						
						
						
							
						
					 
					
						2014-09-30 12:38:38 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							e06adc6d7e 
							
						 
					 
					
						
						
							
							SYN-2: Allow server admins to delete room aliases  
						
						
						
						
							
						
					 
					
						2014-09-30 11:31:42 +01:00 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							1f76377a7c 
							
						 
					 
					
						
						
							
							Re-wrap content after latest additions  
						
						
						
						
							
						
					 
					
						2014-09-29 18:40:15 +01:00 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							dca75a08ba 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into develop  
						
						
						
						
							
						
					 
					
						2014-09-29 18:37:28 +01:00 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							2d61dbc774 
							
						 
					 
					
						
						
							
							Extended docs about the registration/login flows  
						
						
						
						
							
						
					 
					
						2014-09-29 18:36:10 +01:00 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							3ee9a67aa4 
							
						 
					 
					
						
						
							
							Reörder the specification sections, to move 'Registration and Login' first, where it logically belongs  
						
						
						
						
							
						
					 
					
						2014-09-29 18:36:10 +01:00 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							ae953b0884 
							
						 
					 
					
						
						
							
							Huge whitespace hackery - reflow all (content) paragraphs at tw=80  
						
						
						
						
							
						
					 
					
						2014-09-29 18:36:10 +01:00 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							d5bf210998 
							
						 
					 
					
						
						
							
							No longer need the Freenode verification key file  
						
						
						
						
							
						
					 
					
						2014-09-29 18:36:10 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							389285585d 
							
						 
					 
					
						
						
							
							Add a 'Redactions' section.  
						
						
						
						
							
						
					 
					
						2014-09-29 17:19:45 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							3656eb4740 
							
						 
					 
					
						
						
							
							Add m.room.redacted in events list  
						
						
						
						
							
						
					 
					
						2014-09-29 16:39:08 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							f1bdf40dda 
							
						 
					 
					
						
						
							
							Merge branch 'whois' of github.com:matrix-org/synapse into develop  
						
						
						
						
							
						
					 
					
						2014-09-29 15:59:05 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							d96cb61f26 
							
						 
					 
					
						
						
							
							Unbreak tests after changing storage API  
						
						
						
						
							
						
					 
					
						2014-09-29 15:35:57 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							7151615260 
							
						 
					 
					
						
						
							
							Update docstring  
						
						
						
						
							
						
					 
					
						2014-09-29 15:35:54 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							1550ab9e2f 
							
						 
					 
					
						
						
							
							SYN-48: Delete dead code  
						
						
						
						
							
						
					 
					
						2014-09-29 15:04:47 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							1132663cc7 
							
						 
					 
					
						
						
							
							SYN-48: Fix typo. Get the whois for requested user rather tahan the requester  
						
						
						
						
							
						
					 
					
						2014-09-29 15:04:04 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							3ccb17ce59 
							
						 
					 
					
						
						
							
							SYN-48: Implement WHOIS rest servlet  
						
						
						
						
							
						
					 
					
						2014-09-29 14:59:52 +01:00 
						 
				 
			
				
					
						
							
							
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							472ef19100 
							
						 
					 
					
						
						
							
							No longer need the Freenode verification key file  
						
						
						
						
							
						
					 
					
						2014-09-29 14:22:21 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							c65306f877 
							
						 
					 
					
						
						
							
							Add auth check to test if a user is an admin or not.  
						
						
						
						
							
						
					 
					
						2014-09-29 13:35:38 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							f7d80930f2 
							
						 
					 
					
						
						
							
							SYN-48: Track User-Agents as well as IPs for client devices.  
						
						
						
						
							
						
					 
					
						2014-09-29 13:35:15 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							0fdf308874 
							
						 
					 
					
						
						
							
							Track the IP users connect with. Add an admin column to users table.  
						
						
						
						
							
						
					 
					
						2014-09-26 16:36:24 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							7a8307fe7c 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:matrix-org/synapse into develop  
						
						
						
						
							
						
					 
					
						2014-09-25 18:21:42 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							697f6714a4 
							
						 
					 
					
						
						
							
							Merge branch 'release-v0.3.4' of github.com:matrix-org/synapse  
						
						
						
						
							
 
						
					 
					
						2014-09-25 18:21:00 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							ec5fb77a66 
							
						 
					 
					
						
						
							
							Just use a yaml list for turn servers  
						
						
						
						
							
						
					 
					
						2014-09-25 19:18:32 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							f1c9ab4e4f 
							
						 
					 
					
						
						
							
							More change log lines  
						
						
						
						
							
						
					 
					
						2014-09-25 18:10:02 +01:00