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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								515465f900 
								
							 
						 
						
							
							
								
								fix: make element not show "unknown user" warning  
							
							... 
							
							
							
							The 404 error for /profile in the spec says "There is no profile
information for this user or this user does not exist.", but Element
assumes every 404 is a user that does not exist. 
							
						 
						
							2020-08-31 13:23:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Faelar 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								df55e8ed0b 
								
							 
						 
						
							
							
								
								Add room upgrade.  
							
							
							
						 
						
							2020-08-31 12:01:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								aef0c8563c 
								
							 
						 
						
							
							
								
								Merge pull request 'improvement: add remaining key backup endpoints' ( #201 ) from keybackup into master  
							
							... 
							
							
							
							Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/201  
							
						 
						
							2020-08-31 11:24:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								2a63d0955a 
								
							 
						 
						
							
							
								
								Sort and authenticate the events from /send_join response  
							
							
							
						 
						
							2020-08-30 16:08:47 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								3b40f3d60e 
								
							 
						 
						
							
							
								
								Update state-res crate  
							
							
							
						 
						
							2020-08-27 20:11:53 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								f46c2d1eec 
								
							 
						 
						
							
							
								
								Fix review issues, move state-res to spec-comp branch  
							
							
							
						 
						
							2020-08-27 20:11:53 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3f4cb753ee 
								
							 
						 
						
							
							
								
								improvement: add remaining key backup endpoints  
							
							
							
						 
						
							2020-08-27 14:52:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								d15b8d7c4e 
								
							 
						 
						
							
							
								
								Merge pull request 'feat: handle txn ids' ( #198 ) from txnids into master  
							
							... 
							
							
							
							Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/198  
							
						 
						
							2020-08-25 21:35:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4954df3cc3 
								
							 
						 
						
							
							
								
								feat: handle txn ids  
							
							
							
						 
						
							2020-08-25 21:33:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								d9a29e3e5c 
								
							 
						 
						
							
							
								
								Fix state for empty key route  
							
							... 
							
							
							
							Replace None with Some("") for state_key 
							
						 
						
							2020-08-25 15:30:25 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								6343eea417 
								
							 
						 
						
							
							
								
								Merge pull request 'Docker add healthcheck and mention Docker Hub image' ( #196 ) from Weasy666/conduit:master into master  
							
							... 
							
							
							
							Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/196 
Reviewed-by: Timo Kösters <timo@koesters.xyz> 
							
						 
						
							2020-08-25 09:40:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel Wiesenberg 
								
							 
						 
						
							
							
							
							
								
							
							
								38ac3e42be 
								
							 
						 
						
							
							
								
								Docker add healthcheck and mention Docker Hub image  
							
							
							
						 
						
							2020-08-25 09:02:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								0f524955b2 
								
							 
						 
						
							
							
								
								Merge pull request 'fix: send notification count updates when private read receipts change' ( #194 ) from fixrr into master  
							
							... 
							
							
							
							Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/194  
							
						 
						
							2020-08-24 13:39:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0c1cc8d82b 
								
							 
						 
						
							
							
								
								Fix CI  
							
							
							
						 
						
							2020-08-24 11:31:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								33215d6099 
								
							 
						 
						
							
							
								
								fix: send notification count updates when private read receipts change  
							
							
							
						 
						
							2020-08-24 10:46:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								9aa5e99a0f 
								
							 
						 
						
							
							
								
								Merge pull request 'fix: put reason of redaction in the redacted event' ( #193 ) from redact into master  
							
							... 
							
							
							
							Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/193  
							
						 
						
							2020-08-24 10:43:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								f0cb17d7a5 
								
							 
						 
						
							
							
								
								Merge branch 'master' into redact  
							
							
							
						 
						
							2020-08-24 10:42:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								27ffe77823 
								
							 
						 
						
							
							
								
								Use helper instead of route for get_public_rooms_filtered  
							
							
							
						 
						
							2020-08-23 16:45:01 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								1848f08292 
								
							 
						 
						
							
							
								
								Use full sorting algorithm on incoming PDU's in membership  
							
							
							
						 
						
							2020-08-23 16:43:48 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo 
								
							 
						 
						
							
							
							
							
								
							
							
								3c26166fb5 
								
							 
						 
						
							
							
								
								improvement: device list works better  
							
							... 
							
							
							
							The only situation that isn't working yet is sending `left` events for
users when the sender leaves the room 
							
						 
						
							2020-08-23 16:43:48 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo 
								
							 
						 
						
							
							
							
							
								
							
							
								972babbc79 
								
							 
						 
						
							
							
								
								fix: set limited to true when skipping messages in /sync  
							
							
							
						 
						
							2020-08-23 16:43:21 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								672bf4f473 
								
							 
						 
						
							
							
								
								Cargo lock update and a few doc additions  
							
							
							
						 
						
							2020-08-23 16:43:21 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								fe795d38ea 
								
							 
						 
						
							
							
								
								Replace route calling routes with helpers  
							
							... 
							
							
							
							This fixes the panic from ruma "index out of bounds" 
							
						 
						
							2020-08-23 16:43:21 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								5ccdd3694b 
								
							 
						 
						
							
							
								
								Add helper function for get_alias route  
							
							
							
						 
						
							2020-08-23 16:43:21 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								ea20032404 
								
							 
						 
						
							
							
								
								Helper for join_room_by_id route so routes aren't calling routes  
							
							
							
						 
						
							2020-08-23 16:43:21 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								64fb0374b6 
								
							 
						 
						
							
							
								
								Use Vec<u8> instead of string for digest bytes and add roomid_statehash  
							
							
							
						 
						
							2020-08-23 16:43:21 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								d73c6aa8ad 
								
							 
						 
						
							
							
								
								Add roomid_statehash tree, clean up review issues  
							
							
							
						 
						
							2020-08-23 16:43:21 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								846a0098c1 
								
							 
						 
						
							
							
								
								Split append_pdu -> append_pdu and build_and_append  
							
							... 
							
							
							
							Move all state event appending to append_state_pdu. 
							
						 
						
							2020-08-23 16:43:21 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								cb68bf9e0c 
								
							 
						 
						
							
							
								
								Use ring crate to generate StatHashes when saving stateid/statehash  
							
							
							
						 
						
							2020-08-23 16:43:21 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Devin Ragotzy 
								
							 
						 
						
							
							
							
							
								
							
							
								c4f5a0a631 
								
							 
						 
						
							
							
								
								Keep track of State at event for state resolution  
							
							... 
							
							
							
							feat: first steps towards joining rooms over federation
Add state-res as a dependency of conduit
Add reverse_topological_power_sort before append_pdu
Implement statehashstatid_pduid tree for keeping track of state
Clean up implementation of state_hash as key for tracking state 
							
						 
						
							2020-08-23 16:43:21 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								38663228f5 
								
							 
						 
						
							
							
								
								fix: put reason of redaction in the redacted event  
							
							
							
						 
						
							2020-08-23 16:47:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo Kösters 
								
							 
						 
						
							
							
							
							
								
							
							
								8e55623bde 
								
							 
						 
						
							
							
								
								Merge pull request 'More Federation' ( #181 ) from docs into master  
							
							... 
							
							
							
							Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/181  
							
						 
						
							2020-08-23 16:15:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7ba9263cc6 
								
							 
						 
						
							
							
								
								improvement: show most recent PDUs first when searching  
							
							
							
						 
						
							2020-08-23 16:14:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								366554630a 
								
							 
						 
						
							
							
								
								fix: account registration  
							
							
							
						 
						
							2020-08-23 16:14:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								804d097a18 
								
							 
						 
						
							
							
								
								fix: wake up /sync for typing events  
							
							
							
						 
						
							2020-08-23 16:14:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c092f06068 
								
							 
						 
						
							
							
								
								docs: /sync  
							
							
							
						 
						
							2020-08-23 16:14:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								df936e8e7e 
								
							 
						 
						
							
							
								
								improvement: guests are more spec-conform  
							
							
							
						 
						
							2020-08-23 16:14:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								64789537f5 
								
							 
						 
						
							
							
								
								fix: device list when leaving rooms  
							
							
							
						 
						
							2020-08-23 16:14:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4323cf5fec 
								
							 
						 
						
							
							
								
								improvement: device list works better  
							
							... 
							
							
							
							The only situation that isn't working yet is sending `left` events for
users when the sender leaves the room 
							
						 
						
							2020-08-23 16:14:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f23fb32e95 
								
							 
						 
						
							
							
								
								fix: set limited to true when skipping messages in /sync  
							
							
							
						 
						
							2020-08-23 16:14:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									timokoesters 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e457e19088 
								
							 
						 
						
							
							
								
								feat: search pdus  
							
							
							
						 
						
							2020-08-23 16:14:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Timo 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								27d35f5ab4 
								
							 
						 
						
							
							
								
								docs: fix /register method  
							
							
							
						 
						
							2020-08-23 16:14:08 +02:00