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  
				
					
						
							
							
								 
						
							
							
								491f0cd08a 
								
									
								
							
								 
							
						 
						
							
							
								
								Change license ( #13 )  
							
							... 
							
							
							
							* Copyright headers 1
* Licence headers 2
* Copyright Headers 3
* Copyright Headers 4
* Copyright Headers 5
* Copyright Headers 6
* Copyright headers 7
* Add copyright headers for html and config file
* Replace license files and update package.json
* Update with CLA
* lint 
							
						 
						
							2024-09-09 13:57:16 +00:00  
				
					
						
							
							
								 
						
							
							
								c5befa1ef8 
								
									
								
							
								 
							
						 
						
							
							
								
								Stabilize support for MSC3952: intentional mentions ( #10967 )  
							
							... 
							
							
							
							* enable feature_intentional_mentions with v1.7
* org.matrix.msc3952.mentions -> m.mentions
* update push rules test util
* only support stable version 1.7
* use stable values for msc3952 push rules
* use stable intentional mentions rule sin test models
* unstable feature in settings controller 
							
						 
						
							2023-07-11 22:29:54 +00:00  
				
					
						
							
							
								 
						
							
							
								f6e8ffe750 
								
									
								
							
								 
							
						 
						
							
							
								
								add push rules test utility ( #10712 )  
							
							... 
							
							
							
							* add push rules test utility
* strict
* strict 
							
						 
						
							2023-04-27 01:18:19 +00:00