1bee3becfb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/vector-im/element-web  into t3chguy/fix/20721  
							
							
							
						 
						
							2024-11-27 14:53:20 +00:00  
				
					
						
							
							
								 
						
							
							
								3dbcb5efa3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/vector-im/element-web  into dbkr/stateafter  
							
							... 
							
							
							
							# Conflicts:
#	test/unit-tests/components/structures/RoomView-test.tsx
#	test/unit-tests/components/structures/TimelinePanel-test.tsx 
							
						 
						
							2024-11-27 10:47:35 +00:00  
				
					
						
							
							
								 
						
							
							
								3f221891f7 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove space-specific right panel store handling  
							
							... 
							
							
							
							This is no longer needed as the right panel always corresponds to the currently viewed room/space only.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2024-11-25 17:29:32 +00:00  
				
					
						
							
							
								 
						
							
							
								ed9795137b 
								
									
								
							
								 
							
						 
						
							
							
								
								Listen to events so that encryption icon updates when status changes ( #28407 )  
							
							... 
							
							
							
							* listen to events so that encryption icon updates when status changes
* remove debugging message 
							
						 
						
							2024-11-18 23:27:34 +00:00  
				
					
						
							
							
								 
						
							
							
								044eaf7eb5 
								
									
								
							
								 
							
						 
						
							
							
								
								Update calls to addEventToTimeline and addLiveEvents for new signature  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2024-11-06 14:55:21 +00:00  
				
					
						
							
							
								 
						
							
							
								6c6bf811a6 
								
									
								
							
								 
							
						 
						
							
							
								
								Migrate to stylistic  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2024-10-18 14:34:01 +01:00  
				
					
						
							
							
								 
						
							
							
								571ada37a7 
								
									
								
							
								 
							
						 
						
							
							
								
								Replace `MatrixClient.isCryptoEnabled` by `MatrixClient.getCrypto` ( #140 )  
							
							... 
							
							
							
							* Replace `MatrixClient.isCryptoEnabled` by `MatrixClient.getCrypto`
* Cast `cryptoEnabled` as `boolean`
* Fix `MatrixChat-test`
(cherry picked from commit 950ab1940bfcea9443f03284f9175d319c13a44c) 
							
						 
						
							2024-10-16 09:42:18 +01:00  
				
					
						
							
							
								 
						
							
							
								f0ee7f7905 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge matrix-react-sdk into element-web  
							
							... 
							
							
							
							Merge remote-tracking branch 'repomerge/t3chguy/repomerge' into t3chguy/repo-merge
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2024-10-15 15:32:09 +01:00  
				
					
						
							
							
								 
						
							
							
								b084ff2313 
								
									
								
							
								 
							
						 
						
							
							
								
								Prepare for repo merge  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2024-10-15 11:35:21 +01:00