Jonathan de Jong 
								
							 
						 
						
							
							
							
							
								
							
							
								faa283d35b 
								
							 
						 
						
							
							
								
								review feedback  
							
							
							
						 
						
							2021-07-19 13:44:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonathan de Jong 
								
							 
						 
						
							
							
							
							
								
							
							
								3ce75d1f02 
								
							 
						 
						
							
							
								
								apply fix  
							
							
							
						 
						
							2021-07-19 11:55:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								f924ebf8a6 
								
							 
						 
						
							
							
								
								Merge branch 'fix-windows-signal' into 'master'  
							
							... 
							
							
							
							fix signal compiling on windows
See merge request famedly/conduit!126  
							
						 
						
							2021-07-15 16:29:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonathan de Jong 
								
							 
						 
						
							
							
							
							
								
							
							
								b1993421c2 
								
							 
						 
						
							
							
								
								fix signal compiling on windows  
							
							
							
						 
						
							2021-07-15 18:09:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonathan de Jong 
								
							 
						 
						
							
							
							
							
								
							
							
								d76e95e8fc 
								
							 
						 
						
							
							
								
								use existing db cache size  
							
							
							
						 
						
							2021-07-15 13:47:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonathan de Jong 
								
							 
						 
						
							
							
							
							
								
							
							
								661101c9ae 
								
							 
						 
						
							
							
								
								add sled cache_capacity back  
							
							
							
						 
						
							2021-07-15 13:29:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								f7ecf83ac3 
								
							 
						 
						
							
							
								
								Merge branch 'stuff' into 'master'  
							
							... 
							
							
							
							fix: stuck/duplicate messages, e2ee and sync timeouts
See merge request famedly/conduit!123  
							
						 
						
							2021-07-15 08:18:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonathan de Jong 
								
							 
						 
						
							
							
							
							
								
							
							
								952fb75795 
								
							 
						 
						
							
							
								
								add shutdown handler to kick sync  
							
							
							
						 
						
							2021-07-14 14:50:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e12b1ff863 
								
							 
						 
						
							
							
								
								improvement: locks  
							
							
							
						 
						
							2021-07-14 13:21:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e15e6d4405 
								
							 
						 
						
							
							
								
								improvement: efficient /sync, mutex for federation transactions  
							
							
							
						 
						
							2021-07-14 13:20:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1c25492a7e 
								
							 
						 
						
							
							
								
								fix: stuck messages  
							
							... 
							
							
							
							Conduit did not send the event in /sync because of a race condition.
There is a brief moment in time where Conduit accepted the event, but
did not store it yet. So when the client /syncs it updates the since
token without sending the event. I hope I fixed it by significantly
shortening the race-condition period. 
							
						 
						
							2021-07-14 13:19:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8c44312485 
								
							 
						 
						
							
							
								
								fix: e2ee verification  
							
							
							
						 
						
							2021-07-14 13:10:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ac0027756e 
								
							 
						 
						
							
							
								
								improvement: more efficient state res  
							
							
							
						 
						
							2021-07-14 13:10:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonathan de Jong 
								
							 
						 
						
							
							
							
							
								
							
							
								e1b89c1248 
								
							 
						 
						
							
							
								
								apply lint suggestions and version bump  
							
							
							
						 
						
							2021-07-14 12:31:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonathan de Jong 
								
							 
						 
						
							
							
							
							
								
							
							
								15471d9ac4 
								
							 
						 
						
							
							
								
								update rocket and lock  
							
							
							
						 
						
							2021-07-14 11:28:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonathan de Jong 
								
							 
						 
						
							
							
							
							
								
							
							
								9d4fa9a220 
								
							 
						 
						
							
							
								
								Sqlite  
							
							
							
						 
						
							2021-07-14 07:07:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kurt Roeckx 
								
							 
						 
						
							
							
							
							
								
							
							
								dcb5e5900f 
								
							 
						 
						
							
							
								
								Getting capabilities requires authentication  
							
							
							
						 
						
							2021-07-11 22:07:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								4732aa6782 
								
							 
						 
						
							
							
								
								Merge branch 'invalid_utf8' into 'master'  
							
							... 
							
							
							
							Return proper error in case of invalid UTF-8
See merge request famedly/conduit!110  
							
						 
						
							2021-07-11 13:44:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kurt Roeckx 
								
							 
						 
						
							
							
							
							
								
							
							
								699f77671f 
								
							 
						 
						
							
							
								
								Return proper error in case of invalid UTF-8 in json_body  
							
							... 
							
							
							
							json_body is used in places that need authentication. In
case an unknown field is set, Ruma doesn't parse the field
and so doesn't give an error on invalid UTF-8. But Conduit
has parsed and on error makes json_body None. Return an
error to the client instead of generating an internal error. 
							
						 
						
							2021-07-11 14:47:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								13c0beafa6 
								
							 
						 
						
							
							
								
								Merge branch 'lib-fix' into 'master'  
							
							... 
							
							
							
							Export conduits Config struct and fix clippy warnings
See merge request famedly/conduit!99  
							
						 
						
							2021-07-11 11:42:07 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								5711467ad9 
								
							 
						 
						
							
							
								
								Merge branch 'state-res-closure' into 'master'  
							
							... 
							
							
							
							Remove auth_cache using a closure to fetch events in state-res
See merge request famedly/conduit!108  
							
						 
						
							2021-07-02 10:56:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aiden McClelland 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c53cc03ff8 
								
							 
						 
						
							
							
								
								address pr comments  
							
							
							
						 
						
							2021-07-01 13:38:25 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aiden McClelland 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f25f61d4a9 
								
							 
						 
						
							
							
								
								fix errors introduced by rebase  
							
							
							
						 
						
							2021-07-01 12:48:12 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aiden McClelland 
								
							 
						 
						
							
							
							
							
								
							
							
								b2d5516058 
								
							 
						 
						
							
							
								
								add support for arbitrary proxies  
							
							
							
						 
						
							2021-07-01 12:41:12 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								1bb84a8e2d 
								
							 
						 
						
							
							
								
								Fix docs for fetch_and_handle_events  
							
							
							
						 
						
							2021-06-30 07:48:16 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								98f1480e2b 
								
							 
						 
						
							
							
								
								Remove auth_cache using a closure to fetch events in state-res  
							
							
							
						 
						
							2021-06-30 12:54:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								05821d6fd5 
								
							 
						 
						
							
							
								
								improvement: pdu cache, /sync cache  
							
							
							
						 
						
							2021-06-30 10:31:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								09a8737f24 
								
							 
						 
						
							
							
								
								Export conduits Config struct and fix clipp warningsy  
							
							
							
						 
						
							2021-06-29 16:02:12 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dcac1361ec 
								
							 
						 
						
							
							
								
								improvement: /search works for multiple rooms  
							
							
							
						 
						
							2021-06-21 15:21:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								fee7d3d2e3 
								
							 
						 
						
							
							
								
								Merge branch 'allow_appservice_registration' into 'master'  
							
							... 
							
							
							
							Always allow appservices to register new users
See merge request famedly/conduit!105  
							
						 
						
							2021-06-21 10:15:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									phesch 
								
							 
						 
						
							
							
							
							
								
							
							
								637d9d3b6f 
								
							 
						 
						
							
							
								
								Always allow appservices to register new users  
							
							
							
						 
						
							2021-06-19 16:12:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Platte 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								808741bcb6 
								
							 
						 
						
							
							
								
								Remove unnecessary Option-wrapping and successive unwrapping  
							
							
							
						 
						
							2021-06-17 20:44:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Platte 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b291e76572 
								
							 
						 
						
							
							
								
								Use try operator for Option more  
							
							
							
						 
						
							2021-06-17 20:37:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Platte 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f3e630c064 
								
							 
						 
						
							
							
								
								Fix lots of clippy lints  
							
							
							
						 
						
							2021-06-17 20:34:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Platte 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								af2ce5803e 
								
							 
						 
						
							
							
								
								Remove pointless double deserialization  
							
							
							
						 
						
							2021-06-17 20:29:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Platte 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7fa54e4411 
								
							 
						 
						
							
							
								
								Use Ruma-provided default power levels for shorter code  
							
							
							
						 
						
							2021-06-17 20:14:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Platte 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f6046871f4 
								
							 
						 
						
							
							
								
								Upgrade Ruma  
							
							
							
						 
						
							2021-06-17 20:12:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								67f9592b17 
								
							 
						 
						
							
							
								
								feat: /event_auth  
							
							
							
						 
						
							2021-06-14 11:36:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								77a23f8969 
								
							 
						 
						
							
							
								
								improvement: filter our room directory  
							
							... 
							
							
							
							Fixes  #35  
						
							2021-06-14 11:26:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3c9ea55938 
								
							 
						 
						
							
							
								
								feat: /state  
							
							
							
						 
						
							2021-06-14 11:01:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e8f6708927 
								
							 
						 
						
							
							
								
								improvement: show more users in our user directory  
							
							
							
						 
						
							2021-06-12 18:40:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cd4bc520d8 
								
							 
						 
						
							
							
								
								improvement: feature flags for sled, rocksdb  
							
							
							
						 
						
							2021-06-12 15:13:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									hamidreza kalbasi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2078af59d8 
								
							 
						 
						
							
							
								
								fix fmt problems  
							
							
							
						 
						
							2021-06-09 22:22:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									hamidreza kalbasi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2385bd1cfd 
								
							 
						 
						
							
							
								
								add migrations  
							
							
							
						 
						
							2021-06-09 22:22:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									hamidreza kalbasi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								affa124864 
								
							 
						 
						
							
							
								
								create media folder in init  
							
							
							
						 
						
							2021-06-09 22:22:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									hamidreza kalbasi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ff841b73c5 
								
							 
						 
						
							
							
								
								use .keys() and remove unneccery .to_vec()  
							
							
							
						 
						
							2021-06-09 22:22:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									hamidreza kalbasi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								804105479c 
								
							 
						 
						
							
							
								
								fix fmt and clippy warnings  
							
							
							
						 
						
							2021-06-09 22:22:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									hamidreza kalbasi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								972caacdc2 
								
							 
						 
						
							
							
								
								put media in filesystem  
							
							
							
						 
						
							2021-06-09 22:22:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d0ee823254 
								
							 
						 
						
							
							
								
								feat: swappable database backend  
							
							
							
						 
						
							2021-06-09 22:21:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e1e529d818 
								
							 
						 
						
							
							
								
								fix: don't apply push rules for users of other homeservers  
							
							
							
						 
						
							2021-05-30 22:01:12 +02:00