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  
				
					
						
							
							
								 
						
							
							
								8757c8cae0 
								
							
								 
							
						 
						
							
							
								
								move notif UTs to sdk  
							
							
							
						 
						
							2018-04-12 20:24:44 +01:00  
				
					
						
							
							
								 
						
							
							
								9c7731e141 
								
							
								 
							
						 
						
							
							
								
								Don't include src in the test resolve root  
							
							... 
							
							
							
							As https://github.com/matrix-org/matrix-react-sdk/pull/931  
							
						 
						
							2017-05-26 14:02:03 +01:00  
				
					
						
							
							
								 
						
							
							
								121fe34180 
								
							
								 
							
						 
						
							
							
								
								Improve parsing of keyword notification rules  
							
							... 
							
							
							
							For notification rules, the absence of a value on a 'highlight' tweak means
that the highlight should happen; this was previously confusing us.
Use the action parser from NotificationUtils to simplify the code.
Fixes https://github.com/vector-im/vector-web/issues/1330  
							
						 
						
							2016-04-14 22:45:00 +01:00  
				
					
						
							
							
								 
						
							
							
								ff5dff45f5 
								
							
								 
							
						 
						
							
							
								
								Start Notifications component refactor  
							
							... 
							
							
							
							Factor some things out of the mega Notifications component, and add a dummy
unit test to show willing 
							
						 
						
							2016-04-13 18:44:41 +01:00