Matrix
							
						 
						
							 
							
							
							
								
							
								4cab2cfa34 
								
							
								 
							
						 
						
							
							
								
								Don't do any database hits in receipt handling if from_key == to_key  
							
							 
							
							
							
						 
						
							2015-07-18 19:07:12 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b6d4a4c6d8 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #199  from matrix-org/erikj/receipts  
							
							 
							
							... 
							
							
							
							Implement read receipts. 
							
						 
						
							2015-07-16 18:18:36 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d155b318d2 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #203  from matrix-org/erikj/room_creation_presets  
							
							 
							
							... 
							
							
							
							Implement presets at room creation 
							
						 
						
							2015-07-16 18:18:11 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c456d17daf 
								
							
								 
							
						 
						
							
							
								
								Implement specifying custom initial state for /createRoom  
							
							 
							
							
							
						 
						
							2015-07-16 15:25:29 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								4da05fa0ae 
								
							
								 
							
						 
						
							
							
								
								Add back in support for remembering parameters submitted to a user-interactive auth call.  
							
							 
							
							
							
						 
						
							2015-07-15 19:28:57 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								baa55fb69e 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #193  from matrix-org/erikj/bulk_persist_event  
							
							 
							
							... 
							
							
							
							Add bulk insert events API 
							
						 
						
							2015-07-14 10:49:24 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								002a44ac1a 
								
							
								 
							
						 
						
							
							
								
								s/everyone_ops/original_invitees_have_ops/  
							
							 
							
							
							
						 
						
							2015-07-14 10:37:42 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b49a30a972 
								
							
								 
							
						 
						
							
							
								
								Capitalize contants  
							
							 
							
							
							
						 
						
							2015-07-14 10:20:31 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4624d6035e 
								
							
								 
							
						 
						
							
							
								
								Docs  
							
							 
							
							
							
						 
						
							2015-07-14 10:19:07 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d5cc794598 
								
							
								 
							
						 
						
							
							
								
								Implement presets at room creation  
							
							 
							
							
							
						 
						
							2015-07-13 16:56:08 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5989637f37 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts  
							
							 
							
							
							
						 
						
							2015-07-13 13:50:57 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e5991af629 
								
							
								 
							
						 
						
							
							
								
								Comments  
							
							 
							
							
							
						 
						
							2015-07-13 13:30:43 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								532fcc997a 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #196  from matrix-org/erikj/room_history  
							
							 
							
							... 
							
							
							
							Add ability to restrict room history. 
							
						 
						
							2015-07-10 13:47:04 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b5f0d73ea3 
								
							
								 
							
						 
						
							
							
								
								Add comment  
							
							 
							
							
							
						 
						
							2015-07-09 17:09:26 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								f0979afdb0 
								
							
								 
							
						 
						
							
							
								
								Remove spurious comment  
							
							 
							
							
							
						 
						
							2015-07-09 16:02:07 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c2d08ca62a 
								
							
								 
							
						 
						
							
							
								
								Integer timestamps  
							
							 
							
							
							
						 
						
							2015-07-09 13:15:34 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								1af188209a 
								
							
								 
							
						 
						
							
							
								
								Change format of receipts to allow inclusion of data  
							
							 
							
							
							
						 
						
							2015-07-09 11:39:30 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								af812b68dd 
								
							
								 
							
						 
						
							
							
								
								Add a cache to fetching of receipt streams  
							
							 
							
							
							
						 
						
							2015-07-08 15:35:00 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d85ce8d89b 
								
							
								 
							
						 
						
							
							
								
								Split receipt events up into one per room  
							
							 
							
							
							
						 
						
							2015-07-08 11:36:05 +01:00  
						
					 
				
					
						
							
							
								 
								Muthu Subramanian
							
						 
						
							 
							
							
							
								
							
								f53bae0c19 
								
							
								 
							
						 
						
							
							
								
								code beautify  
							
							 
							
							
							
						 
						
							2015-07-08 16:05:46 +05:30  
						
					 
				
					
						
							
							
								 
								Muthu Subramanian
							
						 
						
							 
							
							
							
								
							
								81682d0f82 
								
							
								 
							
						 
						
							
							
								
								Integrate SAML2 basic authentication - uses pysaml2  
							
							 
							
							
							
						 
						
							2015-07-08 15:36:54 +05:30  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								87311d1b8c 
								
							
								 
							
						 
						
							
							
								
								Hook up receipts to v1 initialSync  
							
							 
							
							
							
						 
						
							2015-07-08 11:02:04 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ca041d5526 
								
							
								 
							
						 
						
							
							
								
								Wire together receipts and the notifer/federation  
							
							 
							
							
							
						 
						
							2015-07-07 15:25:30 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								716e426933 
								
							
								 
							
						 
						
							
							
								
								Fix various typos  
							
							 
							
							
							
						 
						
							2015-07-07 10:55:31 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								1a3255b507 
								
							
								 
							
						 
						
							
							
								
								Add m.room.history_visibility to newly created rooms' m.room.power_levels  
							
							 
							
							
							
						 
						
							2015-07-06 13:25:35 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								fb47c3cfbe 
								
							
								 
							
						 
						
							
							
								
								Rename key and values for m.room.history_visibility. Support 'invited' value  
							
							 
							
							
							
						 
						
							2015-07-06 13:05:52 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c3e2600c67 
								
							
								 
							
						 
						
							
							
								
								Filter and redact events that the other server doesn't have permission to see during backfill  
							
							 
							
							
							
						 
						
							2015-07-03 17:52:57 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								400894616d 
								
							
								 
							
						 
						
							
							
								
								Respect m.room.history_visibility in v2_alpha sync API  
							
							 
							
							
							
						 
						
							2015-07-03 14:51:01 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								41938afed8 
								
							
								 
							
						 
						
							
							
								
								Make v1 initial syncs respect room history ACL  
							
							 
							
							
							
						 
						
							2015-07-02 17:12:35 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								1a60545626 
								
							
								 
							
						 
						
							
							
								
								Add basic impl for room history ACL on GET /messages client API  
							
							 
							
							
							
						 
						
							2015-07-02 16:20:10 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								bd1236c0ee 
								
							
								 
							
						 
						
							
							
								
								Consolidate duplicate code in notifier  
							
							 
							
							
							
						 
						
							2015-07-02 11:46:05 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0862fed2a8 
								
							
								 
							
						 
						
							
							
								
								Add basic ReceiptHandler  
							
							 
							
							
							
						 
						
							2015-07-01 17:19:31 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5130d80d79 
								
							
								 
							
						 
						
							
							
								
								Add bulk insert events API  
							
							 
							
							
							
						 
						
							2015-06-25 17:29:34 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9bf61ef97b 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #189  from matrix-org/erikj/room_init_sync  
							
							 
							
							... 
							
							
							
							Improve room init sync speed. 
							
						 
						
							2015-06-19 11:36:06 +01:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								d88e20cdb9 
								
							
								 
							
						 
						
							
							
								
								Fix bug where synapse was sending AS user queries incorrectly.  
							
							 
							
							... 
							
							
							
							Bug introduced in 92b20713d7 
which reversed the comparison when checking if a user existed
in the users table. Added UTs to prevent this happening again. 
							
						 
						
							2015-06-17 17:26:03 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								eceb554a2f 
								
							
								 
							
						 
						
							
							
								
								Use another deferred list  
							
							 
							
							
							
						 
						
							2015-06-16 17:12:27 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b849a64f8d 
								
							
								 
							
						 
						
							
							
								
								Use DeferredList  
							
							 
							
							
							
						 
						
							2015-06-16 17:03:24 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0460406298 
								
							
								 
							
						 
						
							
							
								
								Don't do unecessary db ops in presence.get_state  
							
							 
							
							
							
						 
						
							2015-06-16 16:59:38 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8047fd2434 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #176  from matrix-org/erikj/backfill_auth  
							
							 
							
							... 
							
							
							
							Improve backfill. 
							
						 
						
							2015-06-03 17:25:37 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3bbd0d0e09 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #180  from matrix-org/erikj/prev_state_context  
							
							 
							
							... 
							
							
							
							Don't needlessly compute prev_state 
							
						 
						
							2015-06-03 17:20:56 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								55bf90b9e4 
								
							
								 
							
						 
						
							
							
								
								Don't needlessly compute prev_state  
							
							 
							
							
							
						 
						
							2015-06-03 16:44:24 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								1c3d844e73 
								
							
								 
							
						 
						
							
							
								
								Don't needlessly compute context  
							
							 
							
							
							
						 
						
							2015-06-03 16:41:51 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								09e23334de 
								
							
								 
							
						 
						
							
							
								
								Add a timeout  
							
							 
							
							
							
						 
						
							2015-06-02 11:00:37 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								02410e9239 
								
							
								 
							
						 
						
							
							
								
								Handle the fact we might be missing auth events  
							
							 
							
							
							
						 
						
							2015-06-02 10:58:35 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e552b78d50 
								
							
								 
							
						 
						
							
							
								
								Add some logging  
							
							 
							
							
							
						 
						
							2015-06-02 10:28:14 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								fde0da6f19 
								
							
								 
							
						 
						
							
							
								
								Correctly look up auth_events  
							
							 
							
							
							
						 
						
							2015-06-02 10:19:38 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3f04a08a0c 
								
							
								 
							
						 
						
							
							
								
								Don't process events we've already processed. Remember to process state events  
							
							 
							
							
							
						 
						
							2015-06-02 10:11:32 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4bbfbf898e 
								
							
								 
							
						 
						
							
							
								
								Correctly pass in auth_events  
							
							 
							
							
							
						 
						
							2015-06-01 17:02:23 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								784aaa53df 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into markjh/SYT-8-recaptcha  
							
							 
							
							... 
							
							
							
							Conflicts:
	synapse/handlers/auth.py 
							
						 
						
							2015-05-29 13:49:44 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								d94590ed48 
								
							
								 
							
						 
						
							
							
								
								Add config for setting the recaptcha verify api endpoint, so we can test it in sytest  
							
							 
							
							
							
						 
						
							2015-05-29 12:11:40 +01:00