b633564bea 
								
							
								 
							
						 
						
							
							
								
								unused import  
							
							
							
						 
						
							2020-09-11 13:02:02 +01:00  
				
					
						
							
							
								 
						
							
							
								e54d4e665f 
								
							
								 
							
						 
						
							
							
								
								Don't prompt to remove jitsi widget if the user don't have permission  
							
							
							
						 
						
							2020-09-11 12:20:32 +01:00  
				
					
						
							
							
								 
						
							
							
								96080f2ccc 
								
							
								 
							
						 
						
							
							
								
								Prompt to remove the jitsi widget when pressing the call button  
							
							... 
							
							
							
							If there's already one in the room.
We threw up an error message anyway telling you there was already
a jitsi widget, so just add a button to end the call. 
							
						 
						
							2020-09-10 14:06:13 +01:00  
				
					
						
							
							
								 
						
							
							
								a765db8977 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5189  from matrix-org/travis/rageshake-fix  
							
							... 
							
							
							
							Run the rageshake command through the bug report dialog 
							
						 
						
							2020-09-09 15:08:43 -06:00  
				
					
						
							
							
								 
						
							
							
								c61f2a8099 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5188  from matrix-org/travis/permalink-pills  
							
							... 
							
							
							
							Account for via in pill matching regex 
							
						 
						
							2020-09-09 14:55:58 -06:00  
				
					
						
							
							
								 
						
							
							
								77f715ba73 
								
							
								 
							
						 
						
							
							
								
								Fix i18n and analytics  
							
							
							
						 
						
							2020-09-09 14:55:27 -06:00  
				
					
						
							
							
								 
						
							
							
								9b5823cccb 
								
							
								 
							
						 
						
							
							
								
								Run the rageshake command through the bug report dialog  
							
							... 
							
							
							
							Ideally we encourage users to give us information like a github issue or options to download their logs. 
							
						 
						
							2020-09-09 14:53:38 -06:00  
				
					
						
							
							
								 
						
							
							
								0a7090dd64 
								
							
								 
							
						 
						
							
							
								
								Account for via in pill matching regex  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/element-web/issues/15133 
Regression first appeared in a80bcaa292 
							
						 
						
							2020-09-09 14:36:35 -06:00  
				
					
						
							
							
								 
						
							
							
								91282e8071 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5187  from matrix-org/travis/fix-lock  
							
							... 
							
							
							
							Remove now-unused create-react-class from lockfile 
							
						 
						
							2020-09-09 13:15:11 -06:00  
				
					
						
							
							
								 
						
							
							
								85b5b8b094 
								
							
								 
							
						 
						
							
							
								
								Remove now-unused create-react-class from lockfile  
							
							
							
						 
						
							2020-09-09 13:10:27 -06:00  
				
					
						
							
							
								 
						
							
							
								1b38b4cc00 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5163  from nigelrudolf/develop  
							
							... 
							
							
							
							Fixed 1px jump upwards 
							
						 
						
							2020-09-09 17:49:08 +01:00  
				
					
						
							
							
								 
						
							
							
								050319c0cc 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/matrix-org/matrix-react-sdk  into fix-1px-jump  
							
							
							
						 
						
							2020-09-09 17:37:50 +01:00  
				
					
						
							
							
								 
						
							
							
								62556c2afe 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5184  from matrix-org/dbkr/always_allow_local_widgets  
							
							... 
							
							
							
							Always allow widgets when using the local version 
							
						 
						
							2020-09-09 15:52:31 +01:00  
				
					
						
							
							
								 
						
							
							
								f9079975a1 
								
							
								 
							
						 
						
							
							
								
								write correct jsdoc  
							
							
							
						 
						
							2020-09-09 15:42:25 +01:00  
				
					
						
							
							
								 
						
							
							
								99b0a0a78e 
								
							
								 
							
						 
						
							
							
								
								Always allow widgets when using the local version  
							
							... 
							
							
							
							Since we're not loading the widget URL, there's no need to ask
for permission to load it: it's just another part of the app. 
							
						 
						
							2020-09-09 15:35:05 +01:00  
				
					
						
							
							
								 
						
							
							
								da9f765af8 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5175  from matrix-org/t3chguy/dpsah/6785.3  
							
							... 
							
							
							
							Migrate RoomView and RoomContext to Typescript 
							
						 
						
							2020-09-09 15:27:40 +01:00  
				
					
						
							
							
								 
						
							
							
								a1f1334250 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/matrix-org/matrix-react-sdk  into t3chguy/dpsah/6785.3  
							
							... 
							
							
							
							 Conflicts:
	src/components/structures/RoomView.tsx 
							
						 
						
							2020-09-09 15:16:19 +01:00  
				
					
						
							
							
								 
						
							
							
								0573ab1443 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5183  from RiotTranslateBot/weblate-element-web-matrix-react-sdk  
							
							... 
							
							
							
							Update from Weblate 
							
						 
						
							2020-09-09 14:44:04 +01:00  
				
					
						
							
							
								 
						
							
							
								db5cbdf709 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'origin/develop' into Weblate.  
							
							
							
						 
						
							2020-09-09 13:34:36 +00:00  
				
					
						
							
							
								 
						
							
							
								3aeac749b3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5167  from matrix-org/t3chguy/dpsah/6785.1  
							
							... 
							
							
							
							Right Panel Room Summary and Widgets 
							
						 
						
							2020-09-09 14:34:31 +01:00  
				
					
						
							
							
								 
						
							
							
								04d2f93902 
								
							
								 
							
						 
						
							
							
								
								Fix WidgetStore handler bindings  
							
							
							
						 
						
							2020-09-09 13:15:19 +01:00  
				
					
						
							
							
								 
						
							
							
								0e58eb6d56 
								
							
								 
							
						 
						
							
							
								
								Update initial widget height  
							
							
							
						 
						
							2020-09-09 13:15:07 +01:00  
				
					
						
							
							
								 
						
							
							
								cef533b83e 
								
							
								 
							
						 
						
							
							
								
								Update ellipsis svg  
							
							
							
						 
						
							2020-09-09 13:09:21 +01:00  
				
					
						
							
							
								 
						
							
							
								39a59dbefa 
								
							
								 
							
						 
						
							
							
								
								fix CI some more  
							
							
							
						 
						
							2020-09-09 12:59:41 +01:00  
				
					
						
							
							
								 
						
							
							
								d9e17e89b5 
								
							
								 
							
						 
						
							
							
								
								fix CI  
							
							
							
						 
						
							2020-09-09 12:55:16 +01:00  
				
					
						
							
							
								 
						
							
							
								8d66dce68d 
								
							
								 
							
						 
						
							
							
								
								Update copy and use svg for ellipsis  
							
							
							
						 
						
							2020-09-09 12:50:48 +01:00  
				
					
						
							
							
								 
						
							
							
								b635598bc3 
								
							
								 
							
						 
						
							
							
								
								Attempt to fix tests and fix RoomSummaryCard having wrong member count  
							
							
							
						 
						
							2020-09-09 12:28:12 +01:00  
				
					
						
							
							
								 
						
							
							
								8dcb2d4719 
								
							
								 
							
						 
						
							
							
								
								attempt to fix CI tests  
							
							
							
						 
						
							2020-09-09 12:06:16 +01:00  
				
					
						
							
							
								 
						
							
							
								bb98587143 
								
							
								 
							
						 
						
							
							
								
								fix e2e tests. Change the default Room Tab to RoomSummary  
							
							
							
						 
						
							2020-09-09 11:42:41 +01:00  
				
					
						
							
							
								 
						
							
							
								37c0d524bc 
								
							
								 
							
						 
						
							
							
								
								re-order top right buttons  
							
							
							
						 
						
							2020-09-09 11:06:15 +01:00  
				
					
						
							
							
								 
						
							
							
								fb0b784369 
								
							
								 
							
						 
						
							
							
								
								test CI  
							
							
							
						 
						
							2020-09-09 10:56:14 +01:00  
				
					
						
							
							
								 
						
							
							
								c8bc80a3b1 
								
							
								 
							
						 
						
							
							
								
								test with delay  
							
							
							
						 
						
							2020-09-09 10:07:43 +01:00  
				
					
						
							
							
								 
						
							
							
								29c2a0ef35 
								
							
								 
							
						 
						
							
							
								
								Fix FilePanel and NotificationPanel overscroll issues  
							
							
							
						 
						
							2020-09-09 09:50:08 +01:00  
				
					
						
							
							
								 
						
							
							
								644ff56ace 
								
							
								 
							
						 
						
							
							
								
								Fix e2e tests  
							
							
							
						 
						
							2020-09-09 09:38:13 +01:00  
				
					
						
							
							
								 
						
							
							
								421af52e76 
								
							
								 
							
						 
						
							
							
								
								Fixed 1px jump upwards on filter room members box  
							
							... 
							
							
							
							Signed-off-by: Nigel Mansell <mansell.nigel@mac.com> 
							
						 
						
							2020-09-08 15:29:16 -04:00  
				
					
						
							
							
								 
						
							
							
								517b594edc 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/matrix-org/matrix-react-sdk  into t3chguy/dpsah/6785.1  
							
							... 
							
							
							
							 Conflicts:
	src/components/structures/RightPanel.js 
							
						 
						
							2020-09-08 18:04:24 +01:00  
				
					
						
							
							
								 
						
							
							
								12a6bc8231 
								
							
								 
							
						 
						
							
							
								
								update copy  
							
							
							
						 
						
							2020-09-08 18:00:21 +01:00  
				
					
						
							
							
								 
						
							
							
								596060c506 
								
							
								 
							
						 
						
							
							
								
								fix alignments and iterate PR  
							
							
							
						 
						
							2020-09-08 17:57:08 +01:00  
				
					
						
							
							
								 
						
							
							
								97199c4479 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'origin/develop' into Weblate.  
							
							
							
						 
						
							2020-09-08 16:46:07 +00:00  
				
					
						
							
							
								 
						
							
							
								83c2ae2479 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5180  from matrix-org/t3chguy/fix/15123  
							
							... 
							
							
							
							null-guard roomId in RightPanel and pass Room to UserView 
							
						 
						
							2020-09-08 17:46:02 +01:00  
				
					
						
							
							
								 
						
							
							
								01a8ac25c9 
								
							
								 
							
						 
						
							
							
								
								Use null coalescing operator  
							
							
							
						 
						
							2020-09-08 17:40:57 +01:00  
				
					
						
							
							
								 
						
							
							
								a17b2ba1e5 
								
							
								 
							
						 
						
							
							
								
								use constant  
							
							
							
						 
						
							2020-09-08 17:38:13 +01:00  
				
					
						
							
							
								 
						
							
							
								27a65fff2b 
								
							
								 
							
						 
						
							
							
								
								null-guard roomId in RightPanel and pass Room to UserView  
							
							
							
						 
						
							2020-09-08 17:34:32 +01:00  
				
					
						
							
							
								 
						
							
							
								e204914e31 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'origin/develop' into Weblate.  
							
							
							
						 
						
							2020-09-08 16:27:57 +00:00  
				
					
						
							
							
								 
						
							
							
								093ed37c17 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Spanish)  
							
							... 
							
							
							
							Currently translated at 88.0% (2073 of 2356 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/es/  
							
						 
						
							2020-09-08 16:27:56 +00:00  
				
					
						
							
							
								 
						
							
							
								15aafa019d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5178  from matrix-org/t3chguy/crc.2  
							
							... 
							
							
							
							Fix create-react-class regression. 
							
						 
						
							2020-09-08 17:27:51 +01:00  
				
					
						
							
							
								 
						
							
							
								8d03799ffe 
								
							
								 
							
						 
						
							
							
								
								Fix create-react-class regression.  
							
							... 
							
							
							
							Can't call setState in c'tor 
							
						 
						
							2020-09-08 16:51:55 +01:00  
				
					
						
							
							
								 
						
							
							
								1532048f33 
								
							
								 
							
						 
						
							
							
								
								Fix behaviour WidgetStore for new/unknown rooms  
							
							
							
						 
						
							2020-09-08 16:49:50 +01:00  
				
					
						
							
							
								 
						
							
							
								b982bf87b5 
								
							
								 
							
						 
						
							
							
								
								delint  
							
							
							
						 
						
							2020-09-08 16:33:55 +01:00  
				
					
						
							
							
								 
						
							
							
								6c7cb473dc 
								
							
								 
							
						 
						
							
							
								
								finalise colours from Figma  
							
							
							
						 
						
							2020-09-08 16:33:26 +01:00