Tom Smeding 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2ef23b213a 
								
							 
						 
						
							
							
								
								Consistent and escaped response in get_pdu  
							
							... 
							
							
							
							1. The fallback text of the get_pdu admin room command response message
   now contains the same text as the formatted_body content (namely, the
   json instead of Debug-formatting of a serde type).
2. The formatted_body content of the get_pdu response is now
   html-escaped. 
							
						 
						
							2021-08-21 15:31:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								cefca2d0d1 
								
							 
						 
						
							
							
								
								Merge branch 'different-optimizations-for-master-and-branches' into 'master'  
							
							... 
							
							
							
							CI: Use full optimizations for master and faster config else
See merge request famedly/conduit!155  
							
						 
						
							2021-08-18 08:58:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Zohren 
								
							 
						 
						
							
							
							
							
								
							
							
								9c3a8edcae 
								
							 
						 
						
							
							
								
								Use full optimizations for master and faster config else  
							
							... 
							
							
							
							Signed-off-by: Jonas Zohren <git-pbkyr@jzohren.de> 
							
						 
						
							2021-08-14 21:41:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								8a5dbef474 
								
							 
						 
						
							
							
								
								Merge branch 'set-canonical-room-alias-on-room-creation' into 'master'  
							
							... 
							
							
							
							Try to set canonical room alias on room creation.
Closes  #123 
See merge request famedly/conduit!154  
							
						 
						
							2021-08-12 12:24:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Zohren 
								
							 
						 
						
							
							
							
							
								
							
							
								4cf3c432af 
								
							 
						 
						
							
							
								
								Try to set canonical room alias on room creation.  
							
							... 
							
							
							
							The spec does not require servers to apply a room canonical alias event upon room creation (yet).
Still, synapse does that, since users can set their desired alias in Elements room creation dialog.
With this commit, conduit also sets that alias if it is a valid one.
This closes https://gitlab.com/famedly/conduit/-/issues/123  
							
						 
						
							2021-08-12 14:02:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								dd3c60fb5a 
								
							 
						 
						
							
							
								
								Merge branch 'master' into 'master'  
							
							... 
							
							
							
							Bump version of alpine docker image to 3.14
See merge request famedly/conduit!150  
							
						 
						
							2021-08-10 05:44:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								e83c226b1b 
								
							 
						 
						
							
							
								
								Merge branch 'zap-displayname' into 'master'  
							
							... 
							
							
							
							Set nicer displayname
See merge request famedly/conduit!149  
							
						 
						
							2021-08-10 05:43:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonathan de Jong 
								
							 
						 
						
							
							
							
							
								
							
							
								8335f44bfe 
								
							 
						 
						
							
							
								
								Set nicer displayname  
							
							
							
						 
						
							2021-08-10 05:43:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								3745a7cbe6 
								
							 
						 
						
							
							
								
								Merge branch '3pid' into 'master'  
							
							... 
							
							
							
							Add support for a minimal `r0/account/3pid`.
See merge request famedly/conduit!151  
							
						 
						
							2021-08-10 05:42:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								610b4f9ad1 
								
							 
						 
						
							
							
								
								Merge branch 'fetchprev' into 'master'  
							
							... 
							
							
							
							improvement: try to load missing prev events
See merge request famedly/conduit!152  
							
						 
						
							2021-08-10 05:30:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ahmed Charles 
								
							 
						 
						
							
							
							
							
								
							
							
								879aeafa9e 
								
							 
						 
						
							
							
								
								Add support for a minimal r0/account/3pid.  
							
							
							
						 
						
							2021-08-09 12:34:25 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel Wiesenberg 
								
							 
						 
						
							
							
							
							
								
							
							
								a7b6af7caf 
								
							 
						 
						
							
							
								
								Bump version of alpine docker image to 3.14  
							
							
							
						 
						
							2021-08-09 21:21:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								260db9fcc7 
								
							 
						 
						
							
							
								
								improvement: try to load missing prev events  
							
							
							
						 
						
							2021-08-09 21:05:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								1cbc61c558 
								
							 
						 
						
							
							
								
								Merge branch 'badeventfix' into 'master'  
							
							... 
							
							
							
							fix: handle bad events in db better
See merge request famedly/conduit!148  
							
						 
						
							2021-08-08 19:48:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d2f406e0e8 
								
							 
						 
						
							
							
								
								fix: handle bad events in db better  
							
							
							
						 
						
							2021-08-08 21:33:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								a816e3decd 
								
							 
						 
						
							
							
								
								Merge branch 'room_create_version' into 'master'  
							
							... 
							
							
							
							Support creating rooms with a version
See merge request famedly/conduit!147  
							
						 
						
							2021-08-07 15:36:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kurt Roeckx 
								
							 
						 
						
							
							
							
							
								
							
							
								989a20e99c 
								
							 
						 
						
							
							
								
								Support creating rooms with a version  
							
							
							
						 
						
							2021-08-07 16:25:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								1cf9da26bf 
								
							 
						 
						
							
							
								
								Merge branch 'timeout' into 'master'  
							
							... 
							
							
							
							improvement: longer timeout, more descriptive errors
See merge request famedly/conduit!146  
							
						 
						
							2021-08-04 21:09:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								55a2ff025f 
								
							 
						 
						
							
							
								
								improvement: longer timeout, more descriptive errors  
							
							
							
						 
						
							2021-08-04 22:55:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								76660bf189 
								
							 
						 
						
							
							
								
								Merge branch 'sqlitefixes' into 'master'  
							
							... 
							
							
							
							Sqlitefixes
See merge request famedly/conduit!144  
							
						 
						
							2021-08-04 19:52:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								df727688ef 
								
							 
						 
						
							
							
								
								remove rocksdb  
							
							
							
						 
						
							2021-08-04 21:17:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								902404d48d 
								
							 
						 
						
							
							
								
								improvement: save member count + sled fixes  
							
							
							
						 
						
							2021-08-04 21:15:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b813c34642 
								
							 
						 
						
							
							
								
								improvement: more auth chain caching  
							
							
							
						 
						
							2021-08-04 18:30:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ab7835dedb 
								
							 
						 
						
							
							
								
								fix: early return from state res  
							
							
							
						 
						
							2021-08-04 15:19:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9bb4c3cd01 
								
							 
						 
						
							
							
								
								improvement: batched inserts for tokenids  
							
							
							
						 
						
							2021-08-04 12:54:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fce22362d4 
								
							 
						 
						
							
							
								
								improvement: better auth chain calculation  
							
							
							
						 
						
							2021-08-03 19:18:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								41ec7cf5d0 
								
							 
						 
						
							
							
								
								improvement: batch inserts for stateids  
							
							
							
						 
						
							2021-08-03 16:14:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								49ade0cfbd 
								
							 
						 
						
							
							
								
								improvement: allow batch inserts  
							
							
							
						 
						
							2021-08-03 11:24:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0eeba86b32 
								
							 
						 
						
							
							
								
								fix: improve locks  
							
							
							
						 
						
							2021-08-03 11:17:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6b06fc9707 
								
							 
						 
						
							
							
								
								fix: don't run push rules for users that don't exist  
							
							
							
						 
						
							2021-08-03 10:24:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bd63797213 
								
							 
						 
						
							
							
								
								improvement: make better use of sqlite connections  
							
							
							
						 
						
							2021-08-03 10:24:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2c4f966d60 
								
							 
						 
						
							
							
								
								improvement: use sqlite properly  
							
							
							
						 
						
							2021-08-01 16:59:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								8174b16c38 
								
							 
						 
						
							
							
								
								Merge branch 'master' into 'master'  
							
							... 
							
							
							
							Also push docker image to docker hub
See merge request famedly/conduit!142  
							
						 
						
							2021-08-01 10:10:51 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								6666aae5a5 
								
							 
						 
						
							
							
								
								Merge branch 'docs' into 'master'  
							
							... 
							
							
							
							docs: make it clear that database_path is a folder
See merge request famedly/conduit!143  
							
						 
						
							2021-07-30 17:44:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0f045890eb 
								
							 
						 
						
							
							
								
								docs: make it clear that database_path is a folder  
							
							
							
						 
						
							2021-07-30 19:27:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								9cb99a05e0 
								
							 
						 
						
							
							
								
								Merge branch 'tracing_flame' into 'master'  
							
							... 
							
							
							
							feat: tracing flame graph
See merge request famedly/conduit!140  
							
						 
						
							2021-07-30 16:42:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dc85a8fafd 
								
							 
						 
						
							
							
								
								fix: migration and push edu bugs  
							
							
							
						 
						
							2021-07-30 18:05:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel Wiesenberg 
								
							 
						 
						
							
							
							
							
								
							
							
								fcd127aadc 
								
							 
						 
						
							
							
								
								Also push docker image to docker hub  
							
							
							
						 
						
							2021-07-30 17:15:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5df6b8cd5f 
								
							 
						 
						
							
							
								
								improvement: better account data implementation  
							
							
							
						 
						
							2021-07-30 16:08:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5c776e9ba7 
								
							 
						 
						
							
							
								
								feat: heed db backend (LMDB)  
							
							
							
						 
						
							2021-07-29 23:11:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c209775abd 
								
							 
						 
						
							
							
								
								fix: pdu without state bug  
							
							
							
						 
						
							2021-07-29 12:33:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5e924227b6 
								
							 
						 
						
							
							
								
								feat: add threadpool for iterator threads, bug fixes, tracing_flame support  
							
							
							
						 
						
							2021-07-29 08:49:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								734c4637f0 
								
							 
						 
						
							
							
								
								Merge branch 'ci-build-docker-image' into 'master'  
							
							... 
							
							
							
							CI: Build docker image
See merge request famedly/conduit!134  
							
						 
						
							2021-07-21 15:05:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								e0072eff63 
								
							 
						 
						
							
							
								
								Merge branch 'v5' into 'master'  
							
							... 
							
							
							
							feat: support room version 5
See merge request famedly/conduit!138  
							
						 
						
							2021-07-21 11:05:59 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								cae2b200cc 
								
							 
						 
						
							
							
								
								Merge branch 'initial_state_keys' into 'master'  
							
							... 
							
							
							
							Implement From<AnyInitialStateEvent> on PduBuilder
Closes  #116 
See merge request famedly/conduit!136  
							
						 
						
							2021-07-21 10:03:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								918df9ca6d 
								
							 
						 
						
							
							
								
								feat: support room version 5  
							
							
							
						 
						
							2021-07-21 11:59:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								387e864659 
								
							 
						 
						
							
							
								
								Merge branch 'aliases' into 'master'  
							
							... 
							
							
							
							Implement getting room aliases
See merge request famedly/conduit!116  
							
						 
						
							2021-07-21 09:48:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								c84960df91 
								
							 
						 
						
							
							
								
								Merge branch 'deploy-guide-remove-arm-add-x86_64-musl' into 'master'  
							
							... 
							
							
							
							Docs: Remove arm download, but add x86_64 musl one
See merge request famedly/conduit!137  
							
						 
						
							2021-07-21 09:34:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jonas Zohren 
								
							 
						 
						
							
							
							
							
								
							
							
								32db4c09a0 
								
							 
						 
						
							
							
								
								Docs: Remove arm download, but add x86_64 musl one  
							
							
							
						 
						
							2021-07-21 09:21:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kurt Roeckx 
								
							 
						 
						
							
							
							
							
								
							
							
								0d33cc4acd 
								
							 
						 
						
							
							
								
								Implement getting room aliases  
							
							... 
							
							
							
							Signed-off-by: Kurt Roeckx <kurt@roeckx.be> 
							
						 
						
							2021-07-21 10:56:22 +02:00