Michael Telatynski
							
						 | 
						
							
							
							
								
								
							
							
								
							
								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 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
								
								
							
							
								
							
								b084ff2313
								
									
								
							
								
							
						 | 
						
							
							
								
								Prepare for repo merge
							
							
							
							
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 | 
						
							2024-10-15 11:35:21 +01:00 | 
						
					
				
					
						
							
							
								 
								David Langley
							
						 | 
						
							
							
							
								
								
							
							
								
							
								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 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
								
								
							
							
								
							
								cd8679c172
								
									
								
							
								
							
						 | 
						
							
							
								
								Improve client metadata used for OIDC dynamic registration (#12257)
							
							
							
							
							
						 | 
						
							2024-02-16 14:43:58 +00:00 | 
						
					
				
					
						
							
							
								 
								Michael Weimann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								526645c791
								
									
								
							
								
							
						 | 
						
							
							
								
								Apply prettier formatting
							
							
							
							
							
						 | 
						
							2022-12-12 12:24:14 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
								
								
							
							
								
							
								590b845f3f
								
									
								
							
								
							
						 | 
						
							
							
								
								Remove all usages of UNSAFE_* React methods (#9583)
							
							
							
							
							
						 | 
						
							2022-11-18 09:22:43 +00:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
								
								
							
							
								
							
								04bc8fb71c
								
									
								
							
								
							
						 | 
						
							
							
								
								Optimise Jest run in CI (#9542)
							
							
							
							
							
						 | 
						
							2022-11-04 10:48:08 +00:00 | 
						
					
				
					
						
							
							
								 
								Kerry
							
						 | 
						
							
							
							
								
								
							
							
								
							
								14653d1378
								
									
								
							
								
							
						 | 
						
							
							
								
								Live location share - set time limit (#8082)
							
							
							
							
							
							
							
							* add mocking helpers for platform peg
Signed-off-by: Kerry Archibald <kerrya@element.io>
* basic working live duration dropdown
Signed-off-by: Kerry Archibald <kerrya@element.io>
* add duration format utility
Signed-off-by: Kerry Archibald <kerrya@element.io>
* add duration dropdown to live location picker
Signed-off-by: Kerry Archibald <kerrya@element.io>
* adjust style to allow overflow and variable height chin
Signed-off-by: Kerry Archibald <kerrya@element.io>
* tidy comments
Signed-off-by: Kerry Archibald <kerrya@element.io>
* arrow fn change
Signed-off-by: Kerry Archibald <kerrya@element.io>
* lint
Signed-off-by: Kerry Archibald <kerrya@element.io> 
							
						 | 
						
							2022-03-21 12:42:58 +01:00 |