11e349d6c8 
								
							
								 
							
						 
						
							
							
								
								Update e2e iconography  
							
							
							
						 
						
							2020-09-08 15:42:31 +01:00  
				
					
						
							
							
								 
						
							
							
								87b72de25f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5176  from matrix-org/t3chguy/dpsah/6785.4  
							
							... 
							
							
							
							Fix WatchManager for global room watchers and tidy widget code a little 
							
						 
						
							2020-09-08 15:24:10 +01:00  
				
					
						
							
							
								 
						
							
							
								a80bcaa292 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5174  from matrix-org/t3chguy/fix/15100  
							
							... 
							
							
							
							Fix permalink local linkification to not strip via servers 
							
						 
						
							2020-09-08 15:23:38 +01:00  
				
					
						
							
							
								 
						
							
							
								75518254fb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5173  from matrix-org/jaywink/jitsi-openidjwt-auth  
							
							... 
							
							
							
							Support creation of Jitsi widgets with "openidtoken-jwt" auth 
							
						 
						
							2020-09-08 17:16:50 +03:00  
				
					
						
							
							
								 
						
							
							
								1b99c11b11 
								
							
								 
							
						 
						
							
							
								
								tidy  
							
							
							
						 
						
							2020-09-08 15:09:45 +01:00  
				
					
						
							
							
								 
						
							
							
								5c3c8cfb06 
								
							
								 
							
						 
						
							
							
								
								Make Travis an ounce happier  
							
							
							
						 
						
							2020-09-08 15:07:16 +01:00  
				
					
						
							
							
								 
						
							
							
								73b8493fe8 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5177  from matrix-org/t3chguy/fix/15115  
							
							... 
							
							
							
							Fix create-react-class regression. 
							
						 
						
							2020-09-08 15:03:03 +01:00  
				
					
						
							
							
								 
						
							
							
								5c878ddfdd 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5172  from matrix-org/travis/widgets/msc1960-1  
							
							... 
							
							
							
							Update openid_credentials Widget API action for MSC1960 updates 
							
						 
						
							2020-09-08 07:20:35 -06:00  
				
					
						
							
							
								 
						
							
							
								99cd2dceec 
								
							
								 
							
						 
						
							
							
								
								Fix create-react-class regression.  
							
							... 
							
							
							
							Can't call setState in c'tor 
							
						 
						
							2020-09-08 12:07:24 +01:00  
				
					
						
							
							
								 
						
							
							
								48d9c94c88 
								
							
								 
							
						 
						
							
							
								
								Extract editWidget into WidgetUtils  
							
							
							
						 
						
							2020-09-08 11:12:14 +01:00  
				
					
						
							
							
								 
						
							
							
								b75e2aa299 
								
							
								 
							
						 
						
							
							
								
								WidgetEchoStore improve update event to include roomId and widgetId  
							
							
							
						 
						
							2020-09-08 11:01:55 +01:00  
				
					
						
							
							
								 
						
							
							
								07f7ff6831 
								
							
								 
							
						 
						
							
							
								
								Fix WatchManager global room watchers  
							
							
							
						 
						
							2020-09-08 11:01:36 +01:00  
				
					
						
							
							
								 
						
							
							
								3af0d33e3b 
								
							
								 
							
						 
						
							
							
								
								Make a few fields readonly  
							
							... 
							
							
							
							As they're only set in the constructor. 
							
						 
						
							2020-09-08 13:00:00 +03:00  
				
					
						
							
							
								 
						
							
							
								c19336591e 
								
							
								 
							
						 
						
							
							
								
								Add OpenID token request flow to WidgetApi  
							
							... 
							
							
							
							As per MSC1960. 
							
						 
						
							2020-09-08 12:59:05 +03:00  
				
					
						
							
							
								 
						
							
							
								d0c716d61c 
								
							
								 
							
						 
						
							
							
								
								Fix permalink local linkification to not strip via servers  
							
							
							
						 
						
							2020-09-08 10:26:37 +01:00  
				
					
						
							
							
								 
						
							
							
								ddba5c6223 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5138  from matrix-org/t3chguy/dpsah/6785  
							
							... 
							
							
							
							Allow persistent resizing of the widget app drawer 
							
						 
						
							2020-09-08 09:47:11 +01:00  
				
					
						
							
							
								 
						
							
							
								4b43e39d2a 
								
							
								 
							
						 
						
							
							
								
								Code review related changes  
							
							... 
							
							
							
							* drop room ID from jitsi widget data
* reame queryParts variable 
							
						 
						
							2020-09-08 11:31:40 +03:00  
				
					
						
							
							
								 
						
							
							
								d2e9ea58fd 
								
							
								 
							
						 
						
							
							
								
								Add links to prosody openidtoken-jwt auth docs  
							
							
							
						 
						
							2020-09-07 19:22:40 +03:00  
				
					
						
							
							
								 
						
							
							
								667c129ebc 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/matrix-org/matrix-react-sdk  into t3chguy/dpsah/6785  
							
							... 
							
							
							
							 Conflicts:
	src/components/structures/ScrollPanel.js
	src/components/views/rooms/AppsDrawer.js 
							
						 
						
							2020-09-07 14:33:57 +01:00  
				
					
						
							
							
								 
						
							
							
								80b22d1f82 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5158  from dkanada/patch-1  
							
							... 
							
							
							
							add lenny face command 
							
						 
						
							2020-09-07 14:28:40 +01:00  
				
					
						
							
							
								 
						
							
							
								ae83222d52 
								
							
								 
							
						 
						
							
							
								
								Add GetOpenIDCredentials constant to WidgetApi  
							
							
							
						 
						
							2020-09-07 14:32:00 +03:00  
				
					
						
							
							
								 
						
							
							
								db1eb89552 
								
							
								 
							
						 
						
							
							
								
								MSC numbers are hard to remember  
							
							
							
						 
						
							2020-09-05 15:10:28 -06:00  
				
					
						
							
							
								 
						
							
							
								355d8f5843 
								
							
								 
							
						 
						
							
							
								
								Update openid_credentials Widget API action for MSC1960 updates  
							
							... 
							
							
							
							We now need to send a `state` and `original_request_id` per MSC1960's recent adjustments 
							
						 
						
							2020-09-05 15:06:31 -06:00  
				
					
						
							
							
								 
						
							
							
								7b1031d6a6 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5169  from matrix-org/jryans/defer-cross-signing-setup  
							
							... 
							
							
							
							Prep work for Settings changes with cross-signing deferral 
							
						 
						
							2020-09-04 12:51:25 +01:00  
				
					
						
							
							
								 
						
							
							
								a713c9763b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5168  from matrix-org/t3chguy/dpsah/6785.2  
							
							... 
							
							
							
							Small code clean ups and tweaks 
							
						 
						
							2020-09-04 12:25:46 +01:00  
				
					
						
							
							
								 
						
							
							
								f28c396b1e 
								
							
								 
							
						 
						
							
							
								
								Fix HeaderButtons handler bindings  
							
							
							
						 
						
							2020-09-04 12:14:43 +01:00  
				
					
						
							
							
								 
						
							
							
								13dbfa6b85 
								
							
								 
							
						 
						
							
							
								
								Remove debug statement  
							
							
							
						 
						
							2020-09-04 12:44:43 +03:00  
				
					
						
							
							
								 
						
							
							
								baa6d8a294 
								
							
								 
							
						 
						
							
							
								
								Correctly template in Jitsi widget auth if such exists  
							
							... 
							
							
							
							Also add roomId to the widget data and URL template. It's needed by
the Element Web Jitsi code to produce auth for the Jitsi backend. 
							
						 
						
							2020-09-04 12:42:46 +03:00  
				
					
						
							
							
								 
						
							
							
								4b748b41ca 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5170  from matrix-org/t3chguy/fix/15091  
							
							... 
							
							
							
							Fix soft crash from TruncatedList in the createReactClass conversion 
							
						 
						
							2020-09-04 09:46:00 +01:00  
				
					
						
							
							
								 
						
							
							
								6d811734f4 
								
							
								 
							
						 
						
							
							
								
								Fix soft crash from TruncatedList in the createReactClass conversion  
							
							
							
						 
						
							2020-09-04 09:24:12 +01:00  
				
					
						
							
							
								 
						
							
							
								a511ad6633 
								
							
								 
							
						 
						
							
							
								
								Add (potential) Jitsi auth type to widget data  
							
							... 
							
							
							
							So we don't have to fetch the auth type when joining
the conference. 
							
						 
						
							2020-09-04 10:20:58 +03:00  
				
					
						
							
							
								 
						
							
							
								680de2af95 
								
							
								 
							
						 
						
							
							
								
								Create Jitsi "openidtoken-jwt" auth compatible conference ID's  
							
							... 
							
							
							
							If the Jitsi server we're using for a Jitsi conference call has auth of
"openidtoken-jwt" then instead of a random human readable room ID, encode
the room ID in base32 (without padding). This can then be decoded back to
the room ID on the Jitsi end of things. 
							
						 
						
							2020-09-04 10:05:47 +03:00  
				
					
						
							
							
								 
						
							
							
								db2e1a9cd0 
								
							
								 
							
						 
						
							
							
								
								Add rfc4648 (base64/32/16) encoder to dependencies  
							
							
							
						 
						
							2020-09-04 10:04:18 +03:00  
				
					
						
							
							
								 
						
							
							
								5d8a082eb1 
								
							
								 
							
						 
						
							
							
								
								Add Jitsi auth check  
							
							... 
							
							
							
							Checks for auth needed by looking up a well-known file from the preferred Jitsi domain. No file existing will assume no auth. 
							
						 
						
							2020-09-04 10:03:30 +03:00  
				
					
						
							
							
								 
						
							
							
								e624ce11b4 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5157  from matrix-org/t3chguy/crc1  
							
							... 
							
							
							
							Remove create-react-class 
							
						 
						
							2020-09-03 17:21:58 +01:00  
				
					
						
							
							
								 
						
							
							
								05c3f5c381 
								
							
								 
							
						 
						
							
							
								
								remove redundant key  
							
							
							
						 
						
							2020-09-03 17:05:33 +01:00  
				
					
						
							
							
								 
						
							
							
								4ef3ef40db 
								
							
								 
							
						 
						
							
							
								
								Change to import  
							
							
							
						 
						
							2020-09-03 16:47:56 +01:00  
				
					
						
							
							
								 
						
							
							
								bdfb77077a 
								
							
								 
							
						 
						
							
							
								
								Fix RightPanel propTypes  
							
							
							
						 
						
							2020-09-03 16:08:10 +01:00  
				
					
						
							
							
								 
						
							
							
								368571bcff 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/matrix-org/matrix-react-sdk  into t3chguy/dpsah/6785.2  
							
							
							
						 
						
							2020-09-03 16:07:37 +01:00  
				
					
						
							
							
								 
						
							
							
								97ebfa02c3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5162  from matrix-org/t3chguy/lodash  
							
							... 
							
							
							
							Consolidate Lodash files in bundle 
							
						 
						
							2020-09-03 15:54:43 +01:00  
				
					
						
							
							
								 
						
							
							
								da6cc5c2e9 
								
							
								 
							
						 
						
							
							
								
								Tweak Security settings section headers  
							
							... 
							
							
							
							This brings us slightly closer to the version Design is working from in terms of
section naming.
Prep for https://github.com/vector-im/element-web/issues/13895  
							
						 
						
							2020-09-03 15:41:17 +01:00  
				
					
						
							
							
								 
						
							
							
								280690cf3c 
								
							
								 
							
						 
						
							
							
								
								use useIsEncrypted hook in UserInfo  
							
							
							
						 
						
							2020-09-03 15:07:10 +01:00  
				
					
						
							
							
								 
						
							
							
								3a8499259e 
								
							
								 
							
						 
						
							
							
								
								factor out the useIsEncrypted hook  
							
							
							
						 
						
							2020-09-03 15:06:41 +01:00  
				
					
						
							
							
								 
						
							
							
								6d4de4d22b 
								
							
								 
							
						 
						
							
							
								
								tidy up ScrollPanel comments  
							
							
							
						 
						
							2020-09-03 15:05:35 +01:00  
				
					
						
							
							
								 
						
							
							
								ad9be61477 
								
							
								 
							
						 
						
							
							
								
								Move HeaderButtons to an abstract class  
							
							
							
						 
						
							2020-09-03 15:05:24 +01:00  
				
					
						
							
							
								 
						
							
							
								c7e40d0751 
								
							
								 
							
						 
						
							
							
								
								Fix MemberAvatar props interface  
							
							
							
						 
						
							2020-09-03 15:05:10 +01:00  
				
					
						
							
							
								 
						
							
							
								8b4250c142 
								
							
								 
							
						 
						
							
							
								
								expose RightPanelStore in window  
							
							
							
						 
						
							2020-09-03 15:04:49 +01:00  
				
					
						
							
							
								 
						
							
							
								1479690ac4 
								
							
								 
							
						 
						
							
							
								
								RightPanel use room instead of roomId  
							
							
							
						 
						
							2020-09-03 15:03:47 +01:00  
				
					
						
							
							
								 
						
							
							
								fb2bde94fa 
								
							
								 
							
						 
						
							
							
								
								Rename CrossSigningManager to SecurityManager  
							
							... 
							
							
							
							The file encompasses bits of cross-signing and also secret storage / secure
backup. 
							
						 
						
							2020-09-03 14:50:49 +01:00  
				
					
						
							
							
								 
						
							
							
								18d25acf4f 
								
							
								 
							
						 
						
							
							
								
								Organise cross-signing / secret storage rageshake details  
							
							... 
							
							
							
							This changes to a common prefix for cross-signing and secret storage details so
they appear all together in the alpha-sorted report. 
							
						 
						
							2020-09-03 13:43:14 +01:00