Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								2d1dfb3b34
								
							
								
							
						 | 
						
							
							
								
								Begin implementing all the PDU storage stuff in Events land
							
							
							
							
							
						 | 
						
							2014-10-28 16:42:35 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								ad9226eeec
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'event_signing' of github.com:matrix-org/synapse into federation_authorization
							
							
							
							
							
							
							
							Conflicts:
	synapse/storage/__init__.py 
							
						 | 
						
							2014-10-27 11:58:32 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								bb4a20174c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization
							
							
							
							
							
							
							
							Conflicts:
	synapse/federation/transport.py
	synapse/handlers/message.py 
							
						 | 
						
							2014-10-27 10:20:44 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								b3b1961496
								
							
								
							
						 | 
						
							
							
								
								Fix bug where people could join private rooms
							
							
							
							
							
						 | 
						
							2014-10-17 19:37:41 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								5ffe5ab43f
								
							
								
							
						 | 
						
							
							
								
								Use state groups to get current state. Make join dance actually work.
							
							
							
							
							
						 | 
						
							2014-10-17 18:56:42 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								dc3c2823ac
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into event_signing
							
							
							
							
							
							
							
							Conflicts:
	synapse/federation/replication.py 
							
						 | 
						
							2014-10-17 17:33:58 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								f5cf7ac25b
								
							
								
							
						 | 
						
							
							
								
								SPEC-7: Rename 'ts' to 'origin_server_ts'
							
							
							
							
							
						 | 
						
							2014-10-17 17:12:25 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								f71627567b
								
							
								
							
						 | 
						
							
							
								
								Finish implementing the new join dance.
							
							
							
							
							
						 | 
						
							2014-10-17 15:04:17 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								bb04447c44
								
							
								
							
						 | 
						
							
							
								
								Include hashes of previous pdus when referencing them
							
							
							
							
							
						 | 
						
							2014-10-16 23:25:12 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								1116f5330e
								
							
								
							
						 | 
						
							
							
								
								Start implementing the invite/join dance. Continue moving auth to use event.state_events
							
							
							
							
							
						 | 
						
							2014-10-16 16:56:51 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								1c445f88f6
								
							
								
							
						 | 
						
							
							
								
								persist hashes and origin signatures for PDUs
							
							
							
							
							
						 | 
						
							2014-10-15 17:09:04 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								e7bc1291a0
								
							
								
							
						 | 
						
							
							
								
								Begin making auth use event.old_state_events
							
							
							
							
							
						 | 
						
							2014-10-15 16:06:59 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								07639c79d9
								
							
								
							
						 | 
						
							
							
								
								Respond with more helpful error messages for unsigned requests
							
							
							
							
							
						 | 
						
							2014-10-13 16:39:15 +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 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								7151615260
								
							
								
							
						 | 
						
							
							
								
								Update docstring
							
							
							
							
							
						 | 
						
							2014-09-29 15:35:54 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								3ccb17ce59
								
							
								
							
						 | 
						
							
							
								
								SYN-48: Implement WHOIS rest servlet
							
							
							
							
							
						 | 
						
							2014-09-29 14:59:52 +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
							
						 | 
						
							
							
							
							
								
							
								37bfe44046
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'deletions' of github.com:matrix-org/synapse into develop
							
							
							
							
							
						 | 
						
							2014-09-25 17:02:53 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								dcadfbbd4a
								
							
								
							
						 | 
						
							
							
								
								Don't strip out null's in serialized events, as that is not need anymore and it's not in the spec (yet)
							
							
							
							
							
						 | 
						
							2014-09-25 17:00:17 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								69ddec6589
								
							
								
							
						 | 
						
							
							
								
								Don't strip of False values from events when serializing
							
							
							
							
							
						 | 
						
							2014-09-25 16:49:02 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								327dcc98e3
								
							
								
							
						 | 
						
							
							
								
								SYN-70: And fix another bug where I can't type
							
							
							
							
							
						 | 
						
							2014-09-24 16:19:29 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								87deaf1658
								
							
								
							
						 | 
						
							
							
								
								SYN-70: Fix typo
							
							
							
							
							
						 | 
						
							2014-09-24 16:15:58 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								70899d3ab2
								
							
								
							
						 | 
						
							
							
								
								Rename deletions to redactions
							
							
							
							
							
						 | 
						
							2014-09-24 15:27:59 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								4e79b09dd9
								
							
								
							
						 | 
						
							
							
								
								Fill out the prune_event method.
							
							
							
							
							
						 | 
						
							2014-09-24 11:37:14 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								e3117a2a23
								
							
								
							
						 | 
						
							
							
								
								Add a _matrix/key/v1 resource with the verification keys of the local server
							
							
							
							
							
						 | 
						
							2014-09-23 18:43:34 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								efea61dc50
								
							
								
							
						 | 
						
							
							
								
								Rename 'pruned' to 'pruned_because'
							
							
							
							
							
						 | 
						
							2014-09-23 17:40:58 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								bc250a6afa
								
							
								
							
						 | 
						
							
							
								
								SYN-12: Implement auth for deletion by adding a 'delete_level' on the ops levels event
							
							
							
							
							
							
							
							SYN-12 # comment Auth has been added. 
							
						 | 
						
							2014-09-23 17:36:24 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								932b376b4e
								
							
								
							
						 | 
						
							
							
								
								Add prune_event method
							
							
							
							
							
						 | 
						
							2014-09-23 15:37:32 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								78af6bbb98
								
							
								
							
						 | 
						
							
							
								
								Add m.room.deletion. If an event is deleted it will be returned to clients 'pruned', i.e. all client specified keys will be removed.
							
							
							
							
							
						 | 
						
							2014-09-23 15:28:32 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								4571cf7baa
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into test-sqlite-memory
							
							
							
							
							
						 | 
						
							2014-09-17 18:27:47 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								9973298e2a
								
							
								
							
						 | 
						
							
							
								
								Print expected-vs-actual data types on typecheck failure from check_json()
							
							
							
							
							
						 | 
						
							2014-09-17 15:27:45 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								1e4b971f95
								
							
								
							
						 | 
						
							
							
								
								Fix bug where we didn't always get 'prev_content' key
							
							
							
							
							
						 | 
						
							2014-09-15 17:43:46 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								40d2f38abe
								
							
								
							
						 | 
						
							
							
								
								Fix bug where we incorrectly calculated 'age_ts' from 'age' key rather than the reverse. Don't transmit age_ts to clients for now.
							
							
							
							
							
						 | 
						
							2014-09-15 16:55:39 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								14bc4ed59f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into registration-api-changes in preparation for re-merge to develop.
							
							
							
							
							
						 | 
						
							2014-09-15 15:27:58 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								5bd9369a62
								
							
								
							
						 | 
						
							
							
								
								Correctly handle the 'age' key in events and pdus
							
							
							
							
							
						 | 
						
							2014-09-15 13:26:11 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								34878bc26a
								
							
								
							
						 | 
						
							
							
								
								Added LoginType constants. Created general structure for processing registrations.
							
							
							
							
							
						 | 
						
							2014-09-15 10:23:20 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								1a298aad9c
								
							
								
							
						 | 
						
							
							
								
								Added captcha support on both the HS and web client.
							
							
							
							
							
							
							
							Merge branch 'captcha' of github.com:matrix-org/synapse into develop 
							
						 | 
						
							2014-09-05 23:32:51 -07:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								1829b55bb0
								
							
								
							
						 | 
						
							
							
								
								Captchas now work on registration. Missing x-forwarded-for config arg support. Missing reloading a new captcha on the web client / displaying a sensible error message.
							
							
							
							
							
						 | 
						
							2014-09-05 19:18:23 -07:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								6d19fe1481
								
							
								
							
						 | 
						
							
							
								
								Fix generation of event ids so that they are consistent between local and remote ids
							
							
							
							
							
						 | 
						
							2014-09-06 02:48:13 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								781ff713ba
								
							
								
							
						 | 
						
							
							
								
								When getting a state event also include the previous content
							
							
							
							
							
						 | 
						
							2014-09-06 02:23:36 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								0b9e1e7b56
								
							
								
							
						 | 
						
							
							
								
								Added a captcha config to the HS, to enable registration captcha checking and for the recaptcha private key.
							
							
							
							
							
						 | 
						
							2014-09-05 17:58:06 -07:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								480438eee6
								
							
								
							
						 | 
						
							
							
								
								Validate power levels event changes. Change error messages to be more helpful. Fix bug where we checked the wrong power levels
							
							
							
							
							
						 | 
						
							2014-09-05 21:54:16 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								9dd4570b68
								
							
								
							
						 | 
						
							
							
								
								Generate m.room.aliases event when the HS creates a room alias
							
							
							
							
							
						 | 
						
							2014-09-05 21:35:56 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								250ee2ea7d
								
							
								
							
						 | 
						
							
							
								
								AUth the contents of power level events
							
							
							
							
							
						 | 
						
							2014-09-05 17:13:19 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								95037d8d9d
								
							
								
							
						 | 
						
							
							
								
								Change the default power levels to be 0, 50 and 100
							
							
							
							
							
						 | 
						
							2014-09-05 17:13:03 +01:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								8a7c1d6a00
								
							
								
							
						 | 
						
							
							
								
								fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.
							
							
							
							
							
						 | 
						
							2014-09-03 17:31:57 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								cd0afb85c4
								
							
								
							
						 | 
						
							
							
								
								Updated feedback api docs and fixed feedback content template bug
							
							
							
							
							
						 | 
						
							2014-09-03 13:08:17 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								c6eafdfbaf
								
							
								
							
						 | 
						
							
							
								
								Add copyright notices and fix pyflakes errors
							
							
							
							
							
						 | 
						
							2014-09-03 09:43:11 +01:00 |