Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								4a92a29b56 
								
							 
						 
						
							
							
								
								State resolution outline for /send  
							
							
							
						 
						
							2021-02-09 15:18:47 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								fb9880fee9 
								
							 
						 
						
							
							
								
								Merge branch 'are-we-synpase-sync' into 'master'  
							
							... 
							
							
							
							Sync are-we-synapse with dendrite
See merge request famedly/conduit!21  
							
						 
						
							2021-02-07 21:36:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								098ecb2ca3 
								
							 
						 
						
							
							
								
								Merge branch 'jwt-token-fixed' into 'master'  
							
							... 
							
							
							
							Add 'm.login.token' authentication
See merge request famedly/conduit!5  
							
						 
						
							2021-02-07 17:11:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d49911c5e0 
								
							 
						 
						
							
							
								
								Add 'm.login.token' authentication  
							
							
							
						 
						
							2021-02-07 17:38:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								3588dcd6d0 
								
							 
						 
						
							
							
								
								Merge branch 'deviceid-login' into 'master'  
							
							... 
							
							
							
							Handle optional device_id field during login
See merge request famedly/conduit!16  
							
						 
						
							2021-02-07 12:28:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								2d7012cdb1 
								
							 
						 
						
							
							
								
								Merge branch 'appservices' into 'master'  
							
							... 
							
							
							
							Appservices
Closes  #29 
See merge request famedly/conduit!11  
							
						 
						
							2021-02-07 12:24:28 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ea1e4625d1 
								
							 
						 
						
							
							
								
								fix: default config options  
							
							
							
						 
						
							2021-02-07 13:20:00 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6924dfc8ea 
								
							 
						 
						
							
							
								
								improvement: better appservice compatibility and optimizations  
							
							
							
						 
						
							2021-02-06 15:28:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								7be2a83195 
								
							 
						 
						
							
							
								
								Merge branch 'valkum/complement' into 'master'  
							
							... 
							
							
							
							Complement Testing: Fix binary name typo
See merge request famedly/conduit!20  
							
						 
						
							2021-02-05 08:52:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Valkum 
								
							 
						 
						
							
							
							
							
								
							
							
								1d7207b39e 
								
							 
						 
						
							
							
								
								Sync are-we-synapse with dendrite  
							
							
							
						 
						
							2021-02-05 02:06:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Valkum 
								
							 
						 
						
							
							
							
							
								
							
							
								a61b1cef5b 
								
							 
						 
						
							
							
								
								Fix binary name typo  
							
							
							
						 
						
							2021-02-04 23:51:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								a478ec0443 
								
							 
						 
						
							
							
								
								Merge branch 'cleanup' into 'master'  
							
							... 
							
							
							
							Update repository link in crate metadata
See merge request famedly/conduit!19  
							
						 
						
							2021-02-03 18:30:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fd3fb3a7ed 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'famedly/master' into appservices  
							
							
							
						 
						
							2021-02-03 12:54:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Platte 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6de5b3c2a0 
								
							 
						 
						
							
							
								
								Update repository link in crate metadata  
							
							
							
						 
						
							2021-02-02 18:14:00 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								e4dc7ea8ac 
								
							 
						 
						
							
							
								
								Prevent admin room from recursively spamming itself and user -> user  
							
							
							
						 
						
							2021-01-30 11:52:48 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								73124629b7 
								
							 
						 
						
							
							
								
								Add general rules matching for pusher, calc unread msgs  
							
							
							
						 
						
							2021-01-29 21:48:35 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								2d69e81699 
								
							 
						 
						
							
							
								
								WIP: send out push notification, impl pusher routes  
							
							... 
							
							
							
							It seems in order to test this I may also have to impl the email 3pid
route? I need to call the set_pusher route somehow. 
							
						 
						
							2021-01-29 21:48:09 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								a0ecd76e21 
								
							 
						 
						
							
							
								
								Run cargo fmt using nightly  
							
							
							
						 
						
							2021-01-29 21:48:09 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								56b816a2be 
								
							 
						 
						
							
							
								
								Fix and integrate outlier tree, build forks after adding event to DB  
							
							
							
						 
						
							2021-01-29 21:45:33 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								cd0c5c0566 
								
							 
						 
						
							
							
								
								Append state event that pass resolution to DB, update to tokio 1.1  
							
							
							
						 
						
							2021-01-29 11:20:33 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								b8b40ce38b 
								
							 
						 
						
							
							
								
								Cleanup dbg prints and error messages  
							
							
							
						 
						
							2021-01-28 15:50:45 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								894b6ef037 
								
							 
						 
						
							
							
								
								Resolved state is set as the current room state on incoming events  
							
							
							
						 
						
							2021-01-28 15:33:41 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								265fab843a 
								
							 
						 
						
							
							
								
								feature: push rule settings  
							
							
							
						 
						
							2021-01-28 20:47:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								35c1904b37 
								
							 
						 
						
							
							
								
								Finish forward extremity gathering, use resolved state as new snapshot  
							
							
							
						 
						
							2021-01-24 20:18:40 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a119d858f3 
								
							 
						 
						
							
							
								
								feature: push rule settings  
							
							
							
						 
						
							2021-01-24 16:07:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								87a0019f3a 
								
							 
						 
						
							
							
								
								Merge branch 'valkum/complement' into 'master'  
							
							... 
							
							
							
							Allow the complement test image to use build artifacts
See merge request famedly/conduit!17  
							
						 
						
							2021-01-23 07:43:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Valkum 
								
							 
						 
						
							
							
							
							
								
							
							
								a1e296374f 
								
							 
						 
						
							
							
								
								Allow the complement test image to use build artifacts  
							
							
							
						 
						
							2021-01-22 20:11:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								a897608025 
								
							 
						 
						
							
							
								
								Roll back tokio and rocket update since ruma's request is at 0.2 tokio  
							
							
							
						 
						
							2021-01-18 19:59:08 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								3a6f264450 
								
							 
						 
						
							
							
								
								Add ability to update room leaves with multiple eventIds  
							
							... 
							
							
							
							Tokio seems a bit broken with Rocket... 
							
						 
						
							2021-01-18 19:41:38 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								00436a32b0 
								
							 
						 
						
							
							
								
								Update ruma and rocket to latest git rev and tokio to 1.0  
							
							... 
							
							
							
							Ruma updated the event signing validation code and there was a dep
resolving failure with serde rocket and tokio so I updated rocket latest and
tokio 1.0 to fix. 
							
						 
						
							2021-01-18 19:36:44 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								c65bde41e0 
								
							 
						 
						
							
							
								
								WIP gather and update forward extremities  
							
							
							
						 
						
							2021-01-18 19:08:59 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devon Hudson 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								762255fa8d 
								
							 
						 
						
							
							
								
								Simplify device creation logic during login  
							
							
							
						 
						
							2021-01-17 08:39:47 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devon Hudson 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								890187e004 
								
							 
						 
						
							
							
								
								improvement: Handle optional device_id field during login  
							
							... 
							
							
							
							remove debug logging 
							
						 
						
							2021-01-16 22:19:48 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								9424ba0559 
								
							 
						 
						
							
							
								
								Merge branch 'logout-devices' into 'master'  
							
							... 
							
							
							
							Respect logout_devices param on password change
See merge request famedly/conduit!15  
							
						 
						
							2021-01-16 22:35:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devon Hudson 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ebb38cd330 
								
							 
						 
						
							
							
								
								improvement: respect logout_devices param on password change  
							
							... 
							
							
							
							Move logout devices comment next to relevant loop
remove unnecessary log 
							
						 
						
							2021-01-16 15:14:50 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								b1ae2bbeb2 
								
							 
						 
						
							
							
								
								Fixing the incoming events algorithm (review with time)  
							
							
							
						 
						
							2021-01-16 16:37:20 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								96dc6be14b 
								
							 
						 
						
							
							
								
								Use the auth_events for step 6, WIP forward_extremity_ids fn  
							
							
							
						 
						
							2021-01-15 15:46:47 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								5a8041969d 
								
							 
						 
						
							
							
								
								Fix ALL clippy warnings  
							
							
							
						 
						
							2021-01-15 11:05:57 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								851eb555b6 
								
							 
						 
						
							
							
								
								Abstract event validation/fetching, add outlier and signing key DB trees  
							
							... 
							
							
							
							Fixed the miss named commented out keys in conduit-example.toml. 
							
						 
						
							2021-01-14 21:32:22 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								2ac3ffbb24 
								
							 
						 
						
							
							
								
								Convert uses of Box<ServerName> to a ref  
							
							
							
						 
						
							2021-01-14 15:11:55 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								7c4e116caa 
								
							 
						 
						
							
							
								
								State resolution outline for /send  
							
							
							
						 
						
							2021-01-14 15:07:40 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								27c4e9d9d5 
								
							 
						 
						
							
							
								
								Fix signature/hash checks, fetch recursive auth events  
							
							
							
						 
						
							2021-01-14 14:36:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								88f3ee489b 
								
							 
						 
						
							
							
								
								Fill event_map with all events that will be needed for resolution  
							
							
							
						 
						
							2021-01-14 14:31:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8a035880f0 
								
							 
						 
						
							
							
								
								Remove StateStore trait from state-res collect events needed  
							
							
							
						 
						
							2021-01-14 14:30:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7c4d74bf9b 
								
							 
						 
						
							
							
								
								Fix clippy warnings remove unused imports  
							
							
							
						 
						
							2021-01-14 14:30:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0ee239c9d7 
								
							 
						 
						
							
							
								
								Step 5 in /send just fetches state from incoming server  
							
							
							
						 
						
							2021-01-14 14:30:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9e83d2b2d5 
								
							 
						 
						
							
							
								
								Update state-res, use the new Event trait  
							
							... 
							
							
							
							This also bumps ruma to latest and removes js_int infavor of the ruma
re-export 
							
						 
						
							2021-01-14 14:30:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								690c066064 
								
							 
						 
						
							
							
								
								State resolution outline for /send  
							
							
							
						 
						
							2021-01-14 14:28:32 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Paul van Tilburg 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c263e13000 
								
							 
						 
						
							
							
								
								fix: update binary file name in docs for consistency  
							
							
							
						 
						
							2021-01-11 20:28:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ad7b3f184b 
								
							 
						 
						
							
							
								
								improvement: send 200 response for turn server info  
							
							... 
							
							
							
							We didn't implement it, but this will stop clients from retrying the
endpoint every minute 
							
						 
						
							2021-01-11 17:26:47 +01:00