Timo Kösters
								
							 
						 | 
						
							
							
							
							
								
							
							
								d35ad69af1
								
							
						 | 
						
							
							
								
								Merge branch 'up-ruma' into 'master'
							
							
							
							
							
							
							
							Bump ruma
See merge request famedly/conduit!70 
							
						 | 
						
							2021-04-28 09:44:04 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jonas Platte
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								2e1d7d12ca
								
							
						 | 
						
							
							
								
								Refactor usage of CanonicalJsonValue
							
							
							
							
							
						 | 
						
							2021-04-26 19:03:51 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jonas Platte
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c2b72773d5
								
							
						 | 
						
							
							
								
								Fix clippy warning
							
							
							
							
							
						 | 
						
							2021-04-26 19:02:32 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jonas Platte
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								5be5c9e9f0
								
							
						 | 
						
							
							
								
								Bump ruma
							
							
							
							
							
						 | 
						
							2021-04-26 19:02:32 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Timo Kösters
								
							 
						 | 
						
							
							
							
							
								
							
							
								f9f37cfcf8
								
							
						 | 
						
							
							
								
								Merge branch 'invites' into 'master'
							
							
							
							
							
							
							
							feat: send invites over federation
Closes #53
See merge request famedly/conduit!69 
							
						 | 
						
							2021-04-26 16:53:53 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Timo Kösters
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								58463bba93
								
							
						 | 
						
							
							
								
								feat: send invites over federation
							
							
							
							
							
						 | 
						
							2021-04-25 14:10:21 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Timo Kösters
								
							 
						 | 
						
							
							
							
							
								
							
							
								abe176e3d0
								
							
						 | 
						
							
							
								
								Merge branch 'sending' into 'master'
							
							
							
							
							
							
							
							fix: send transaction retry code
See merge request famedly/conduit!68 
							
						 | 
						
							2021-04-24 21:17:18 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Timo Kösters
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								3dfc245633
								
							
						 | 
						
							
							
								
								fix: send transaction retry code
							
							
							
							
							
						 | 
						
							2021-04-24 18:26:41 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Timo Kösters
								
							 
						 | 
						
							
							
							
							
								
							
							
								dd0b2597b7
								
							
						 | 
						
							
							
								
								Merge branch 'signatures' into 'master'
							
							
							
							
							
							
							
							feat: verify signatures for incoming requests
Closes #77
See merge request famedly/conduit!65 
							
						 | 
						
							2021-04-24 12:55:41 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Timo Kösters
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								2fc1ec2ad5
								
							
						 | 
						
							
							
								
								fix: logging
							
							
							
							
							
						 | 
						
							2021-04-24 13:34:35 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Timo Kösters
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								226045ea4b
								
							
						 | 
						
							
							
								
								improvement: warning on misconfigured reverse proxy
							
							
							
							
							
						 | 
						
							2021-04-24 12:29:02 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jonas Platte
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								026af6b1a6
								
							
						 | 
						
							
							
								
								Improve formatting of ruma_wrapper.rs
							
							
							
							
							
						 | 
						
							2021-04-24 12:22:42 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jonas Platte
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								d8b484beed
								
							
						 | 
						
							
							
								
								Upgrade ruma
							
							
							
							
							
						 | 
						
							2021-04-24 12:22:36 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jonas Platte
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e72fd44bb5
								
							
						 | 
						
							
							
								
								Refactor send_request for appservices
							
							
							
							
							
						 | 
						
							2021-04-24 12:18:21 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jonas Platte
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								7067d7acae
								
							
						 | 
						
							
							
								
								Refactor Responder implementation for RumaResponse
							
							
							
							
							
						 | 
						
							2021-04-24 12:18:21 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Timo Kösters
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								23f81bfaf7
								
							
						 | 
						
							
							
								
								chore: update dependencies
							
							
							
							
							
						 | 
						
							2021-04-24 12:18:19 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Timo Kösters
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								bb234ca002
								
							
						 | 
						
							
							
								
								fix: only show one typing event per user
							
							
							
							
							
						 | 
						
							2021-04-24 12:17:45 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Timo Kösters
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6e84d317b2
								
							
						 | 
						
							
							
								
								improvement: update ruma
							
							
							
							
							
						 | 
						
							2021-04-24 12:17:44 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Timo Kösters
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								1f84013b2a
								
							
						 | 
						
							
							
								
								feat: verify signatures for incoming requests
							
							
							
							
							
						 | 
						
							2021-04-24 12:17:44 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Timo Kösters
								
							 
						 | 
						
							
							
							
							
								
							
							
								f89e3668fd
								
							
						 | 
						
							
							
								
								Merge branch 'deploy-proxy' into 'master'
							
							
							
							
							
							
							
							Document proper proxy options in DEPLOY.md
See merge request famedly/conduit!67 
							
						 | 
						
							2021-04-24 08:57:11 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Gabriel Souza Franco
								
							 
						 | 
						
							
							
							
							
								
							
							
								7e4320a079
								
							
						 | 
						
							
							
								
								chore: document proper proxy options in DEPLOY.md
							
							
							
							
							
						 | 
						
							2021-04-23 15:27:35 -03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Paul van Tilburg
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f63a624743
								
							
						 | 
						
							
							
								
								Add text about using cargo-deb to the README
							
							
							
							
							
						 | 
						
							2021-04-23 19:11:42 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Timo Kösters
								
							 
						 | 
						
							
							
							
							
								
							
							
								8c72909bb8
								
							
						 | 
						
							
							
								
								Merge branch 'tls-name' into 'master'
							
							
							
							
							
							
							
							Validate TLS certificates according to Matrix spec
See merge request famedly/conduit!60 
							
						 | 
						
							2021-04-23 05:22:07 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Paul van Tilburg
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								4fb2f17b83
								
							
						 | 
						
							
							
								
								Purge debconf changes from the DB on purge
							
							
							
							
							
						 | 
						
							2021-04-22 21:52:47 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Paul van Tilburg
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								19aaffeb23
								
							
						 | 
						
							
							
								
								Change the default port (follows DEPLOY.md)
							
							
							
							
							
						 | 
						
							2021-04-22 21:52:47 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Paul van Tilburg
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f3b1096417
								
							
						 | 
						
							
							
								
								Change the default library path (follows DEPLOY.md)
							
							
							
							
							
						 | 
						
							2021-04-22 21:52:47 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Paul van Tilburg
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								5bf43a4d7e
								
							
						 | 
						
							
							
								
								Generate conduit.toml instead of debian environment file
							
							
							
							
							
							
							
							Only generate this file once. I am not sure what to do with future
upgrades yet. 
							
						 | 
						
							2021-04-22 21:52:40 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Timo Kösters
								
							 
						 | 
						
							
							
							
							
								
							
							
								14c7ecf722
								
							
						 | 
						
							
							
								
								Merge branch 'improvements' into 'master'
							
							
							
							
							
							
							
							Implement /devices
Closes #62
See merge request famedly/conduit!64 
							
						 | 
						
							2021-04-21 09:03:18 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Timo Kösters
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								2f440e644d
								
							
						 | 
						
							
							
								
								fix: clippy
							
							
							
							
							
						 | 
						
							2021-04-21 10:59:07 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Timo Kösters
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								71ed1b295a
								
							
						 | 
						
							
							
								
								feat: /devices route
							
							
							
							
							
						 | 
						
							2021-04-21 10:51:56 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Timo Kösters
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e815486030
								
							
						 | 
						
							
							
								
								fix: don't allow inviting other users (not implemented yet)
							
							
							
							
							
						 | 
						
							2021-04-21 10:00:23 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Gabriel Souza Franco
								
							 
						 | 
						
							
							
							
							
								
							
							
								ed253e236c
								
							
						 | 
						
							
							
								
								chore: document FedDest, fix tests
							
							
							
							
							
						 | 
						
							2021-04-21 00:35:44 -03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Timo Kösters
								
							 
						 | 
						
							
							
							
							
								
							
							
								1937cf554f
								
							
						 | 
						
							
							
								
								Merge branch 'add-ci' into 'master'
							
							
							
							
							
							
							
							Add basic CI
See merge request famedly/conduit!41 
							
						 | 
						
							2021-04-20 12:23:28 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Timo Kösters
								
							 
						 | 
						
							
							
							
							
								
							
							
								9adcc20335
								
							
						 | 
						
							
							
								
								Merge branch 'update-readme' into 'master'
							
							
							
							
							
							
							
							docs: update readme
See merge request famedly/conduit!63 
							
						 | 
						
							2021-04-20 11:21:18 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Timo Kösters
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								4c4e1f9027
								
							
						 | 
						
							
							
								
								docs: update readme
							
							
							
							
							
						 | 
						
							2021-04-20 13:07:00 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Timo Kösters
								
							 
						 | 
						
							
							
							
							
								
							
							
								ad19264c38
								
							
						 | 
						
							
							
								
								Merge branch 'fix-fetch' into 'master'
							
							
							
							
							
							
							
							fix: bug when fetching events over federation
See merge request famedly/conduit!62 
							
						 | 
						
							2021-04-19 10:00:47 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Timo Kösters
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								0b9182455c
								
							
						 | 
						
							
							
								
								fix: use working email
							
							
							
							
							
						 | 
						
							2021-04-19 11:57:17 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Timo Kösters
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								d4e0ba245b
								
							
						 | 
						
							
							
								
								fix: bug when fetching events over federation
							
							
							
							
							
						 | 
						
							2021-04-19 11:55:27 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Timo Kösters
								
							 
						 | 
						
							
							
							
							
								
							
							
								0b89ffe566
								
							
						 | 
						
							
							
								
								Merge branch 'make-join' into 'master'
							
							
							
							
							
							
							
							feat: make_join, send_join and /directory
See merge request famedly/conduit!59 
							
						 | 
						
							2021-04-16 21:15:27 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Paul van Tilburg
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								ab58609d3d
								
							
						 | 
						
							
							
								
								No longer use/support a local environment file
							
							
							
							
							
						 | 
						
							2021-04-16 22:07:58 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Timo Kösters
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								eedac4fd96
								
							
						 | 
						
							
							
								
								feat: make_join, send_join and /directory
							
							
							
							
							
						 | 
						
							2021-04-16 18:18:29 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Gabriel Souza Franco
								
							 
						 | 
						
							
							
							
							
								
							
							
								7faa021ff5
								
							
						 | 
						
							
							
								
								chore: code formatting and cleanup
							
							
							
							
							
						 | 
						
							2021-04-16 12:18:22 -03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Timo Kösters
								
							 
						 | 
						
							
							
							
							
								
							
							
								6d109b9902
								
							
						 | 
						
							
							
								
								Merge branch 'mdformatting' into 'master'
							
							
							
							
							
							
							
							docs: Fix markdown formatting in DEPLOY.md
See merge request famedly/conduit!58 
							
						 | 
						
							2021-04-16 09:24:52 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Tobias Fella
								
							 
						 | 
						
							
							
							
							
								
							
							
								95db30918e
								
							
						 | 
						
							
							
								
								docs: Fix fix formatting of code blocks in markdown
							
							
							
							
							
						 | 
						
							2021-04-16 11:10:01 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Gabriel Souza Franco
								
							 
						 | 
						
							
							
							
							
								
							
							
								e73de2317e
								
							
						 | 
						
							
							
								
								fix: verify tls cert for non-conformant servers
							
							
							
							
							
						 | 
						
							2021-04-16 00:36:35 -03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Gabriel Souza Franco
								
							 
						 | 
						
							
							
							
							
								
							
							
								b4c001de2f
								
							
						 | 
						
							
							
								
								chore: cleanup string-based code in find_actual_destination
							
							
							
							
							
						 | 
						
							2021-04-16 00:27:26 -03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Gabriel Souza Franco
								
							 
						 | 
						
							
							
							
							
								
							
							
								0b56589dce
								
							
						 | 
						
							
							
								
								feat: add handling of tls cert for delegated hosts
							
							
							
							
							
						 | 
						
							2021-04-15 22:07:27 -03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Timo Kösters
								
							 
						 | 
						
							
							
							
							
								
							
							
								18398e1f17
								
							
						 | 
						
							
							
								
								Merge branch 'bump-stateres' into 'master'
							
							
							
							
							
							
							
							Bump stateres
See merge request famedly/conduit!57 
							
						 | 
						
							2021-04-14 15:47:00 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Timo Kösters
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								04b08d4505
								
							
						 | 
						
							
							
								
								chore: bump stateres
							
							
							
							
							
						 | 
						
							2021-04-14 17:46:17 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Timo Kösters
								
							 
						 | 
						
							
							
							
							
								
							
							
								f6c4da829e
								
							
						 | 
						
							
							
								
								Merge branch 'better-joining' into 'master'
							
							
							
							
							
							
							
							improvement: use invite state as hints to what servers to ask for joining
See merge request famedly/conduit!56 
							
						 | 
						
							2021-04-14 13:06:14 +00:00 | 
						
						
							
							
							
								
							
							
						 |