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  
				
					
						
							
							
								 
						
							
							
								1677ed1be0 
								
									
								
							
								 
							
						 
						
							
							
								
								MSC4108 support OIDC QR code login ( #12370 )  
							
							... 
							
							
							
							Co-authored-by: Hugh Nimmo-Smith <hughns@matrix.org> 
							
						 
						
							2024-06-06 09:57:28 +01:00  
				
					
						
							
							
								 
						
							
							
								7b1e8e3d2f 
								
									
								
							
								 
							
						 
						
							
							
								
								Update MSC2965 OIDC Discovery implementation ( #12245 )  
							
							... 
							
							
							
							Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> 
							
						 
						
							2024-02-23 16:43:14 +00:00  
				
					
						
							
							
								 
						
							
							
								ad73b0c16e 
								
									
								
							
								 
							
						 
						
							
							
								
								Switch to importing most things from the main matrix-js-sdk export ( #11406 )  
							
							... 
							
							
							
							* Switch to importing most things from the main matrix-js-sdk export
* fix imports
* Iterate
* Fix tests 
							
						 
						
							2023-08-15 15:00:17 +00:00  
				
					
						
							
							
								 
						
							
							
								01bd80fe59 
								
									
								
							
								 
							
						 
						
							
							
								
								OIDC: update to `oidc-client-ts` functions from js-sdk ( #11193 )  
							
							... 
							
							
							
							* test util for oidcclientconfigs
* rename type and lint
* correct oidc test util
* store issuer and clientId pre auth navigation
* update for js-sdk userstate, tidy 
							
						 
						
							2023-07-10 00:57:16 +00:00