Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								f7c2d23599 
								
							 
						 
						
							
							
								
								Merge branch 'master' into valkum/complement  
							
							
							
						 
						
							2020-10-16 14:27:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								294fae5cdb 
								
							 
						 
						
							
							
								
								Merge pull request 'Update dependencies, remove dbgs' ( #222 ) from deps into master  
							
							... 
							
							
							
							Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/222  
							
						 
						
							2020-10-16 14:12:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								dfcfab5b7e 
								
							 
						 
						
							
							
								
								Merge branch 'master' into deps  
							
							
							
						 
						
							2020-10-16 14:06:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9d1387954f 
								
							 
						 
						
							
							
								
								Update dependencies, remove dbgs  
							
							
							
						 
						
							2020-10-16 14:04:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								15fa7fb1cc 
								
							 
						 
						
							
							
								
								Merge pull request 'Reduce media ID length from 256 to 32' ( #216 ) from miruka/conduit:reduce-mxc-length into master  
							
							... 
							
							
							
							Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/216 
Reviewed-by: Timo Kösters <timo@koesters.xyz> 
							
						 
						
							2020-10-16 13:24:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								b6ed018d16 
								
							 
						 
						
							
							
								
								Merge branch 'master' into reduce-mxc-length  
							
							
							
						 
						
							2020-10-14 11:48:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								0e817f6951 
								
							 
						 
						
							
							
								
								Merge pull request 'Federation, Admin room and many fixes' ( #221 ) from federation into master  
							
							... 
							
							
							
							Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/221  
							
						 
						
							2020-10-13 19:04:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								304c53c4f5 
								
							 
						 
						
							
							
								
								style: make clippy happier  
							
							
							
						 
						
							2020-10-07 12:29:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4964e21342 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into federation  
							
							
							
						 
						
							2020-10-07 12:02:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6afc4c9b3e 
								
							 
						 
						
							
							
								
								feat: federation disabled by default  
							
							... 
							
							
							
							It can be enable in the Rocket.toml config or using ROCKET_FEDERATION_ENABLED=true 
							
						 
						
							2020-10-07 11:51:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c15ae3c126 
								
							 
						 
						
							
							
								
								fix: invalid typing bytes because of 0xff in numbers  
							
							
							
						 
						
							2020-10-07 11:51:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bcd1fe1856 
								
							 
						 
						
							
							
								
								feat: admin room  
							
							
							
						 
						
							2020-10-07 11:51:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0d6159c2da 
								
							 
						 
						
							
							
								
								improvement: get_missing_events route and cleanup  
							
							
							
						 
						
							2020-10-01 20:49:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ab332363ce 
								
							 
						 
						
							
							
								
								fix: don't send new requests to servers if we are already waiting  
							
							
							
						 
						
							2020-10-01 20:49:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									miruka 
								
							 
						 
						
							
							
							
							
								
							
							
								26e200e290 
								
							 
						 
						
							
							
								
								Reduce media ID length from 256 to 32  
							
							... 
							
							
							
							Most common filesystems limit paths to 255 bytes.
This change brings down the media ID length to be similar to
Synapse servers (25), and makes it possible for clients to
download media with the ID included in the filename. 
							
						 
						
							2020-09-25 14:18:36 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e08dfd982b 
								
							 
						 
						
							
							
								
								improvement: look at SRV record when sending requests  
							
							
							
						 
						
							2020-09-23 12:04:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								f0beffb0a9 
								
							 
						 
						
							
							
								
								Merge pull request 'Fix ruma dependency' ( #211 ) from fix into master  
							
							... 
							
							
							
							Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/211  
							
						 
						
							2020-09-20 18:18:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								19207845bc 
								
							 
						 
						
							
							
								
								Fix ruma dependency  
							
							
							
						 
						
							2020-09-20 13:49:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								267c721616 
								
							 
						 
						
							
							
								
								fix: encryption and sync spam  
							
							
							
						 
						
							2020-09-18 10:29:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8bcfff2766 
								
							 
						 
						
							
							
								
								fix: no notification counts for fast /syncs  
							
							
							
						 
						
							2020-09-18 10:29:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ea3aaa6b5c 
								
							 
						 
						
							
							
								
								improvement: more efficient /sync with gaps  
							
							
							
						 
						
							2020-09-18 10:29:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rudi Floren 
								
							 
						 
						
							
							
							
							
								
							
							
								009e36b680 
								
							 
						 
						
							
							
								
								Fix Caddy integration for reverse-proxy  
							
							
							
						 
						
							2020-09-17 21:11:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rudi Floren 
								
							 
						 
						
							
							
							
							
								
							
							
								7c456a0390 
								
							 
						 
						
							
							
								
								Update dockerignore  
							
							... 
							
							
							
							Removing Rocket-example.toml from here is fine,
as it is not included in the last stage of our build stages 
							
						 
						
							2020-09-17 20:14:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Valkum 
								
							 
						 
						
							
							
							
							
								
							
							
								da28c12eeb 
								
							 
						 
						
							
							
								
								Try to add TLS reverse proxy for complement  
							
							
							
						 
						
							2020-09-17 15:36:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Valkum 
								
							 
						 
						
							
							
							
							
								
							
							
								8d66428beb 
								
							 
						 
						
							
							
								
								Add intermediate container to hide ARGs  
							
							... 
							
							
							
							ARGs contain secrets to speed up builds 
							
						 
						
							2020-09-17 12:50:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								506c2a3146 
								
							 
						 
						
							
							
								
								fix: can't find count from event in db  
							
							
							
						 
						
							2020-09-17 10:24:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Valkum 
								
							 
						 
						
							
							
							
							
								
							
							
								3e03787551 
								
							 
						 
						
							
							
								
								Add Complement dockerfile and move sytest dir  
							
							
							
						 
						
							2020-09-16 19:53:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4db6d7e430 
								
							 
						 
						
							
							
								
								fix: remove avatar url checks  
							
							... 
							
							
							
							They are not in the spec and maubot relies on that 
							
						 
						
							2020-09-16 18:10:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a567cd81d5 
								
							 
						 
						
							
							
								
								improvement: better logs on deserialization errors  
							
							
							
						 
						
							2020-09-16 15:08:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f4078a29eb 
								
							 
						 
						
							
							
								
								fix: synapse complains about missing origin  
							
							
							
						 
						
							2020-09-16 11:42:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dd749b8aee 
								
							 
						 
						
							
							
								
								fix: server keys and destination resolution when server name contains port  
							
							
							
						 
						
							2020-09-16 11:01:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								005e00e9b1 
								
							 
						 
						
							
							
								
								fix: remove well-known  
							
							
							
						 
						
							2020-09-15 17:16:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1bf614b0f5 
								
							 
						 
						
							
							
								
								fix: remove transaction_id from pdus over federation  
							
							
							
						 
						
							2020-09-15 17:02:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b7ab57897b 
								
							 
						 
						
							
							
								
								fix: sending slowness  
							
							
							
						 
						
							2020-09-15 16:14:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0b263208e3 
								
							 
						 
						
							
							
								
								fix: don't panic on bad server names  
							
							
							
						 
						
							2020-09-15 08:55:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								71500b14b9 
								
							 
						 
						
							
							
								
								fix: send to all servers and fix media store  
							
							
							
						 
						
							2020-09-15 08:17:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f7816b11de 
								
							 
						 
						
							
							
								
								feat: send messages over federation  
							
							
							
						 
						
							2020-09-15 08:17:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9f05ef926a 
								
							 
						 
						
							
							
								
								fix: filter public room dir  
							
							
							
						 
						
							2020-09-14 16:23:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d1099e9224 
								
							 
						 
						
							
							
								
								Update dependencies  
							
							
							
						 
						
							2020-09-14 14:36:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								aa5e9e607e 
								
							 
						 
						
							
							
								
								feat: download media and thumbnails over federation  
							
							
							
						 
						
							2020-09-14 14:20:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4e44fedbcd 
								
							 
						 
						
							
							
								
								fix: room list over federation  
							
							
							
						 
						
							2020-09-14 11:43:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c5313b3e8f 
								
							 
						 
						
							
							
								
								improvement: try out multiple servers when joining remote rooms  
							
							
							
						 
						
							2020-09-14 11:00:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1f292c09f2 
								
							 
						 
						
							
							
								
								improvement: better federation joins  
							
							
							
						 
						
							2020-09-14 09:29:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								af53485d70 
								
							 
						 
						
							
							
								
								fix: avoid pdus without event ids  
							
							
							
						 
						
							2020-09-12 23:38:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1f28434988 
								
							 
						 
						
							
							
								
								feat: hacky transactions  
							
							
							
						 
						
							2020-09-12 22:42:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e6b1f54857 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into federation  
							
							
							
						 
						
							2020-09-12 22:23:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								12a8c9badd 
								
							 
						 
						
							
							
								
								fix: join rooms over federation  
							
							
							
						 
						
							2020-09-12 21:30:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1e8fbd8d50 
								
							 
						 
						
							
							
								
								Update ruma version  
							
							
							
						 
						
							2020-09-08 17:32:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								b5488f86b5 
								
							 
						 
						
							
							
								
								Merge pull request 'Add room upgrade.' ( #182 ) from q-b/conduit-fork:rooms_upgrade into master  
							
							... 
							
							
							
							Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/182 
Reviewed-by: Timo Kösters <timo@koesters.xyz> 
							
						 
						
							2020-09-01 13:10:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								698e44a732 
								
							 
						 
						
							
							
								
								Fix /upgrade account data problems  
							
							
							
						 
						
							2020-09-01 13:08:49 +02:00