Jonas Platte 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fe744c856f 
								
							 
						 
						
							
							
								
								Upgrade ruma  
							
							... 
							
							
							
							… and refactor push rule code along the way. 
							
						 
						
							2021-04-06 17:38:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marcel 
								
							 
						 
						
							
							
							
							
								
							
							
								c267c0f09e 
								
							 
						 
						
							
							
								
								fix: use full codeblocks and capitalize Conduit and Debian  
							
							
							
						 
						
							2021-04-06 13:17:39 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marcel 
								
							 
						 
						
							
							
							
							
								
							
							
								9b2f8730bb 
								
							 
						 
						
							
							
								
								fix: Do not run conduit as root instead use a separate user  
							
							
							
						 
						
							2021-04-06 12:26:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								c9b1f0ca83 
								
							 
						 
						
							
							
								
								Merge branch 'k0gen-master-patch-33282' into 'master'  
							
							... 
							
							
							
							No need to log out and back in fix
See merge request famedly/conduit!47  
							
						 
						
							2021-04-03 13:04:55 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mariusz Kogen 
								
							 
						 
						
							
							
							
							
								
							
							
								246e4735fd 
								
							 
						 
						
							
							
								
								No need to log out and back in fix  
							
							
							
						 
						
							2021-04-02 22:11:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								db7044a950 
								
							 
						 
						
							
							
								
								sytest test  
							
							
							
						 
						
							2021-03-26 13:41:05 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								8c6a49bec3 
								
							 
						 
						
							
							
								
								Merge branch 'update_CI_for_develop' into 'develop'  
							
							... 
							
							
							
							Update Complement CI container
See merge request famedly/conduit!46  
							
						 
						
							2021-03-26 12:31:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cd4dc13731 
								
							 
						 
						
							
							
								
								fix: use correct room versions  
							
							
							
						 
						
							2021-03-26 13:30:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rudi Floren 
								
							 
						 
						
							
							
							
							
								
							
							
								5a13f6f7e0 
								
							 
						 
						
							
							
								
								Remove build container and use the always present build artifact directly  
							
							... 
							
							
							
							Proper chmod caddy and conduit binaries 
							
						 
						
							2021-03-26 04:19:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c213769d9f 
								
							 
						 
						
							
							
								
								improvement: refactor state res and fix a few bugs in the process  
							
							
							
						 
						
							2021-03-25 23:55:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								16eed1d8c2 
								
							 
						 
						
							
							
								
								chore: get rid of warnings  
							
							
							
						 
						
							2021-03-24 12:44:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e50f2864de 
								
							 
						 
						
							
							
								
								improvement: save state for send_join pdu  
							
							
							
						 
						
							2021-03-24 11:46:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e305889b72 
								
							 
						 
						
							
							
								
								feat: room_account_data endpoints  
							
							
							
						 
						
							2021-03-24 08:48:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1d00a8c41f 
								
							 
						 
						
							
							
								
								improvement: better logging  
							
							... 
							
							
							
							Use CONDUIT_LOG or the log setting in the config 
							
						 
						
							2021-03-23 22:06:09 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								46d8f36a2c 
								
							 
						 
						
							
							
								
								fix: media thumbnail calculation and appservice detection  
							
							
							
						 
						
							2021-03-23 21:18:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3ea7d162db 
								
							 
						 
						
							
							
								
								fix: various improvements and fixes  
							
							
							
						 
						
							2021-03-23 12:59:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								363c629faf 
								
							 
						 
						
							
							
								
								fix: signature key fetching, optimize push sending  
							
							
							
						 
						
							2021-03-22 14:04:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d4c76f4654 
								
							 
						 
						
							
							
								
								chore: update ruma  
							
							
							
						 
						
							2021-03-18 19:38:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f775c76d8a 
								
							 
						 
						
							
							
								
								chore: get rid of warnings  
							
							
							
						 
						
							2021-03-18 18:33:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								abe9122df6 
								
							 
						 
						
							
							
								
								Merge branch 'more-gitignore' into 'master'  
							
							... 
							
							
							
							Add more gitignore
See merge request famedly/conduit!42  
							
						 
						
							2021-03-18 17:09:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gabriel Souza Franco 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7b3fe88345 
								
							 
						 
						
							
							
								
								Send proper Host header in federation requests  
							
							
							
						 
						
							2021-03-18 17:59:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5cb15551f3 
								
							 
						 
						
							
							
								
								improvement: use db compression  
							
							
							
						 
						
							2021-03-18 13:13:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a0fa0ee7a0 
								
							 
						 
						
							
							
								
								fix: join appservice room with alias  
							
							
							
						 
						
							2021-03-18 12:03:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a77fcd106e 
								
							 
						 
						
							
							
								
								feat: implement /state_ids and fix federation stuff  
							
							
							
						 
						
							2021-03-18 00:11:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								100307c936 
								
							 
						 
						
							
							
								
								improvement: optimize state storage  
							
							
							
						 
						
							2021-03-17 22:31:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								44425a903a 
								
							 
						 
						
							
							
								
								fix: multiple federation/pusher fixes  
							
							
							
						 
						
							2021-03-16 18:00:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								21f785d530 
								
							 
						 
						
							
							
								
								Merge branch 'correct-sendtxn' into pushers  
							
							
							
						 
						
							2021-03-15 09:56:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonathan de Jong 
								
							 
						 
						
							
							
							
							
								
							
							
								0367028203 
								
							 
						 
						
							
							
								
								add settings.json  
							
							
							
						 
						
							2021-03-14 11:55:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonathan de Jong 
								
							 
						 
						
							
							
							
							
								
							
							
								d0d5bc412b 
								
							 
						 
						
							
							
								
								Add more gitignore  
							
							
							
						 
						
							2021-03-13 20:33:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonathan de Jong 
								
							 
						 
						
							
							
							
							
								
							
							
								f79053484b 
								
							 
						 
						
							
							
								
								Add .gitlab-ci.yml  
							
							
							
						 
						
							2021-03-13 20:18:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6da40225bb 
								
							 
						 
						
							
							
								
								improvement: make state res actually work  
							
							
							
						 
						
							2021-03-13 16:30:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								e785ff6f56 
								
							 
						 
						
							
							
								
								Merge branch 'sled-no-metrics' into 'master'  
							
							... 
							
							
							
							fix: avoid illegal instruction crash
See merge request famedly/conduit!38  
							
						 
						
							2021-03-12 17:29:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7bc58461cd 
								
							 
						 
						
							
							
								
								fix: avoid illegal instruction crash  
							
							... 
							
							
							
							see https://github.com/spacejam/sled/issues/1232  
							
						 
						
							2021-03-12 16:22:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								6538d91567 
								
							 
						 
						
							
							
								
								Merge branch 'readme' into 'master'  
							
							... 
							
							
							
							docs: add icon and license to readme
See merge request famedly/conduit!37  
							
						 
						
							2021-03-04 20:37:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								96431069a9 
								
							 
						 
						
							
							
								
								docs: add icon and license to readme  
							
							
							
						 
						
							2021-03-04 21:37:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								3436e844c2 
								
							 
						 
						
							
							
								
								Merge branch 'valkum-master-patch-62987' into 'master'  
							
							... 
							
							
							
							Fix Complement CI paths
See merge request famedly/conduit!36  
							
						 
						
							2021-03-04 17:51:52 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rudi Floren 
								
							 
						 
						
							
							
							
							
								
							
							
								156296ac05 
								
							 
						 
						
							
							
								
								Fix Complement CI paths  
							
							... 
							
							
							
							The final container tried to COPY from the default cargo target dir, but we only checked if cached_target is present.
We copy from cached_target to target when cached_target is present now in the builder 
							
						 
						
							2021-03-04 17:22:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								643109309b 
								
							 
						 
						
							
							
								
								Merge branch 'incoming-pdu' into 'master'  
							
							... 
							
							
							
							fix: don't accept incoming pdus if we know about them already
Closes  #70 
See merge request famedly/conduit!33  
							
						 
						
							2021-03-04 14:38:07 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								03440f4b15 
								
							 
						 
						
							
							
								
								Merge branch 'readme' into 'master'  
							
							... 
							
							
							
							docs: small readme changes
See merge request famedly/conduit!35  
							
						 
						
							2021-03-04 14:35:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								79c910efdf 
								
							 
						 
						
							
							
								
								Merge branch 'clippy_again' into 'master'  
							
							... 
							
							
							
							Fix more clippy errors in master
See merge request famedly/conduit!34  
							
						 
						
							2021-03-04 14:30:28 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bb1064ce04 
								
							 
						 
						
							
							
								
								docs: small readme changes  
							
							
							
						 
						
							2021-03-04 15:28:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rudi Floren 
								
							 
						 
						
							
							
							
							
								
							
							
								4027cbd01d 
								
							 
						 
						
							
							
								
								Fix various clippy errors  
							
							
							
						 
						
							2021-03-04 15:27:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rudi Floren 
								
							 
						 
						
							
							
							
							
								
							
							
								6309506a48 
								
							 
						 
						
							
							
								
								Allow suspicious_else_formatting  
							
							... 
							
							
							
							This is probably unfixable because it is caused by macros 
							
						 
						
							2021-03-04 15:26:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								0d55964d24 
								
							 
						 
						
							
							
								
								Run nightly cargo fmt  
							
							
							
						 
						
							2021-03-04 08:45:23 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								d0df8b495c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into correct-sendtxn  
							
							
							
						 
						
							2021-03-04 08:39:16 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								e239014fa3 
								
							 
						 
						
							
							
								
								Query for the correct server  
							
							
							
						 
						
							2021-03-04 08:02:41 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1ce00f90fe 
								
							 
						 
						
							
							
								
								fix: don't accept incoming pdus if we know about them already  
							
							
							
						 
						
							2021-03-04 13:37:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								bd6507eafb 
								
							 
						 
						
							
							
								
								Merge branch 'valkum-master-patch-25423' into 'master'  
							
							... 
							
							
							
							Make clippy happy (needless-return, etc.)
See merge request famedly/conduit!23  
							
						 
						
							2021-03-04 12:35:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rudi Floren 
								
							 
						 
						
							
							
							
							
								
							
							
								231c6032f4 
								
							 
						 
						
							
							
								
								Make clippy happy (needless-return, etc.)  
							
							
							
						 
						
							2021-03-04 12:35:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								eaeba35f3c 
								
							 
						 
						
							
							
								
								Merge branch 'valkum/complement' into 'master'  
							
							... 
							
							
							
							Sync paths with CI pipeline due to dockerignore
See merge request famedly/conduit!24  
							
						 
						
							2021-03-04 12:32:55 +00:00