David Baker
							
						 
						
							 
							
							
							
								
							
								99252e08b0 
								
							
								 
							
						 
						
							
							
								
								Unintentional commit  
							
							 
							
							
							
						 
						
							2020-01-24 09:37:43 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								cd4e75c378 
								
							
								 
							
						 
						
							
							
								
								Unnecessary blank line  
							
							 
							
							
							
						 
						
							2020-01-24 09:36:22 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								a3026277c1 
								
							
								 
							
						 
						
							
							
								
								Unused variable  
							
							 
							
							
							
						 
						
							2020-01-23 18:24:03 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								5319ee4572 
								
							
								 
							
						 
						
							
							
								
								Remove riot logo from the security setup screens  
							
							 
							
							... 
							
							
							
							With a little faff to make the rounded borders consistent again 
							
						 
						
							2020-01-23 18:14:08 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
								
								
							
							
								
							
								8d59cb4632 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3903  from matrix-org/dbkr/bootstrap_visuals_1  
							
							 
							
							... 
							
							
							
							Updated visuals for cross-signing bootstrap 
							
						 
						
							2020-01-23 11:51:32 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								10db79bb93 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/bootstrap_visuals_1  
							
							 
							
							
							
						 
						
							2020-01-23 11:05:21 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
								
								
							
							
								
							
								442b8be459 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3897  from matrix-org/dbkr/bootstrap_from_key_backup_ui  
							
							 
							
							... 
							
							
							
							Implement some parts of new cross signing bootstrap UI 
							
						 
						
							2020-01-23 11:04:49 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								c0b7132404 
								
							
								 
							
						 
						
							
							
								
								Different copy on done screen if we setup from scratch  
							
							 
							
							
							
						 
						
							2020-01-23 10:18:08 +00:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
								
								
							
							
								
							
								1fdd155dd2 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3904  from matrix-org/jryans/report-admin-external-links  
							
							 
							
							... 
							
							
							
							Treat links as external in report content admin message 
							
						 
						
							2020-01-23 01:06:42 +00:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								a504faa2f6 
								
							
								 
							
						 
						
							
							
								
								Treat links as external in report content admin message  
							
							 
							
							... 
							
							
							
							This marks all the links in the report content admin message (in Markdown
format) as external so they open in a new tab. 
							
						 
						
							2020-01-22 22:08:37 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								7a028af359 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3902  from matrix-org/t3chguy/free_the_svg  
							
							 
							
							... 
							
							
							
							Be consistent about our settings svg, free the other one 
							
						 
						
							2020-01-22 21:14:25 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
								
								
							
							
								
							
								a95cde106f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3899  from matrix-org/dbkr/npm_prepare  
							
							 
							
							... 
							
							
							
							Change prepublish script to prepare 
							
						 
						
							2020-01-22 20:57:18 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								30b0663eb0 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							 
							
							
							
						 
						
							2020-01-22 18:15:35 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								78654cc693 
								
							
								 
							
						 
						
							
							
								
								Updated visuals for cross-signing bootstrap  
							
							 
							
							... 
							
							
							
							* Use Fields rather than plain inputs
 * Update padding & alignment to match designs
 * Add Skip buttons
 * Update copy as per designs
Part of https://github.com/vector-im/riot-web/issues/11902 
Based on https://github.com/matrix-org/matrix-react-sdk/pull/3897  
							
						 
						
							2020-01-22 18:08:39 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								33b5d42c06 
								
							
								 
							
						 
						
							
							
								
								Be consistent about our settings svg, free the other one  
							
							 
							
							
							
						 
						
							2020-01-22 15:34:17 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
								
								
							
							
								
							
								2e0977fb0c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3901  from matrix-org/dbkr/kill_react_sdk_version  
							
							 
							
							... 
							
							
							
							Remove the react-sdk version 
							
						 
						
							2020-01-22 15:26:22 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								cd412b1df4 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3900  from matrix-org/t3chguy/buildkite  
							
							 
							
							... 
							
							
							
							BuildKite: Retry end-to-end tests automatically once if they fail 
							
						 
						
							2020-01-22 15:26:01 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								7e52eb9f65 
								
							
								 
							
						 
						
							
							
								
								Unused import  
							
							 
							
							
							
						 
						
							2020-01-22 15:16:41 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								c04872dd9b 
								
							
								 
							
						 
						
							
							
								
								i18n  
							
							 
							
							
							
						 
						
							2020-01-22 15:12:38 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								d04ba40efe 
								
							
								 
							
						 
						
							
							
								
								fix syntax  
							
							 
							
							
							
						 
						
							2020-01-22 15:05:40 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								e3a28e3e44 
								
							
								 
							
						 
						
							
							
								
								Remove the react-sdk version  
							
							 
							
							... 
							
							
							
							I'm not sure if there was ever a point where this did work and
we had 'dist' and 'gitHead' properties in our package.json but
I can't find any trace of them now and I'm sick of this just being
there syaing '<local>' all the time. 
							
						 
						
							2020-01-22 15:05:25 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								088b1ea628 
								
							
								 
							
						 
						
							
							
								
								Retry end-to-end tests automatically once if they fail, flakey flake  
							
							 
							
							
							
						 
						
							2020-01-22 15:03:48 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								97edb824bc 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3893  from matrix-org/t3chguy/double_slash  
							
							 
							
							... 
							
							
							
							Slash Command improvements around sending messages with leading slash 
							
						 
						
							2020-01-22 14:32:09 +00:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
								
								
							
							
								
							
								33533646d3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3898  from matrix-org/jryans/extra-report-content  
							
							 
							
							... 
							
							
							
							Support admin configurable message when reporting content 
							
						 
						
							2020-01-22 14:25:39 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								516dd25797 
								
							
								 
							
						 
						
							
							
								
								fix typo in fallback codepath  
							
							 
							
							
							
						 
						
							2020-01-22 14:24:10 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								2842e8dee8 
								
							
								 
							
						 
						
							
							
								
								Change prepublish script to prepare  
							
							 
							
							... 
							
							
							
							prepublish is deprecated (prepare also runs for git checkouts, and
lib will need to be built in this case). 
							
						 
						
							2020-01-22 14:15:17 +00:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
							
								
							
								fbb65f068a 
								
							
								 
							
						 
						
							
							
								
								Support admin configurable message when reporting content  
							
							 
							
							... 
							
							
							
							This adds support for an admin-configured message in config.json to be shown in
the report content dialog to allow linking to community rules, etc.
Fixes https://github.com/vector-im/riot-web/issues/11992  
							
						 
						
							2020-01-22 14:07:18 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								e1e53f567f 
								
							
								 
							
						 
						
							
							
								
								add more tests  
							
							 
							
							
							
						 
						
							2020-01-22 11:56:27 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								e98269822c 
								
							
								 
							
						 
						
							
							
								
								Add icon to bootstrap dialogs  
							
							 
							
							
							
						 
						
							2020-01-22 11:44:47 +00:00  
						
					 
				
					
						
							
							
								 
								Zoe
							
						 
						
							 
							
							
								
								
							
							
								
							
								684974372d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3896  from matrix-org/zip/11986-only-warn-unverified  
							
							 
							
							... 
							
							
							
							Don't warn on unverified users; ensured behavior stays the same with flags off 
							
						 
						
							2020-01-22 11:44:14 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								2a331c0a2b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3895  from matrix-org/t3chguy/roving  
							
							 
							
							... 
							
							
							
							Fix roving room list for resizer and ff tabstop a11y 
							
						 
						
							2020-01-22 11:24:23 +00:00  
						
					 
				
					
						
							
							
								 
								Zoe
							
						 
						
							 
							
							
							
								
							
								85ee6bd51f 
								
							
								 
							
						 
						
							
							
								
								Don't warn on unverified users; ensured behavior stays the same with flags off  
							
							 
							
							
							
						 
						
							2020-01-22 11:22:20 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								fc724cfe70 
								
							
								 
							
						 
						
							
							
								
								fix tests some moar  
							
							 
							
							
							
						 
						
							2020-01-22 11:05:25 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								644d68d836 
								
							
								 
							
						 
						
							
							
								
								Update copy in bootstrap success dialog phase  
							
							 
							
							
							
						 
						
							2020-01-22 10:59:50 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								176605c302 
								
							
								 
							
						 
						
							
							
								
								update tests to match new rendering method  
							
							 
							
							
							
						 
						
							2020-01-22 10:49:58 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								d211372740 
								
							
								 
							
						 
						
							
							
								
								UI to bootsrap SSSS from key backup  
							
							 
							
							
							
						 
						
							2020-01-22 10:44:02 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								37fb500e22 
								
							
								 
							
						 
						
							
							
								
								fix useCallback dependencies, delint  
							
							 
							
							
							
						 
						
							2020-01-22 10:41:10 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								2c6fe78012 
								
							
								 
							
						 
						
							
							
								
								Fix roving room list for resizer and ff tabstop a11y  
							
							 
							
							
							
						 
						
							2020-01-22 10:36:20 +00:00  
						
					 
				
					
						
							
							
								 
								Zoe
							
						 
						
							 
							
							
								
								
							
							
								
							
								0809d7dcba 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3875  from matrix-org/zip/11880-message-shields  
							
							 
							
							... 
							
							
							
							Verify individual messages via cross-signing 
							
						 
						
							2020-01-21 18:11:36 +00:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								5cb0dc41b7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3882  from matrix-org/travis/fix-tests  
							
							 
							
							... 
							
							
							
							Fix layering of dependencies in riot-web and e2e tests 
							
						 
						
							2020-01-21 11:09:27 -07:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								7b26067397 
								
							
								 
							
						 
						
							
							
								
								delint  
							
							 
							
							
							
						 
						
							2020-01-21 18:03:01 +00:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								708f62784f 
								
									
								
							
								 
							
						 
						
							
							
								
								Consistency  
							
							 
							
							... 
							
							
							
							Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com> 
							
						 
						
							2020-01-21 10:59:33 -07:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								e455aa474d 
								
							
								 
							
						 
						
							
							
								
								improve copy further  
							
							 
							
							
							
						 
						
							2020-01-21 17:58:53 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								a8df058ea6 
								
							
								 
							
						 
						
							
							
								
								tidy up, improve wording on modal  
							
							 
							
							
							
						 
						
							2020-01-21 17:54:27 +00:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								33220c2d72 
								
							
								 
							
						 
						
							
							
								
								Ensure generated files are present for riot-web tests  
							
							 
							
							
							
						 
						
							2020-01-21 10:53:17 -07:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								587ff6ad75 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3844  from matrix-org/t3chguy/roving  
							
							 
							
							... 
							
							
							
							Implement Roving Tab Index and Room List as TreeView 
							
						 
						
							2020-01-21 17:36:30 +00:00  
						
					 
				
					
						
							
							
								 
								Zoe
							
						 
						
							 
							
							
							
								
							
								2480f709b3 
								
							
								 
							
						 
						
							
							
								
								E2ESTATE -> E2E_STATE  
							
							 
							
							
							
						 
						
							2020-01-21 17:19:10 +00:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								9f7df33bc3 
								
							
								 
							
						 
						
							
							
								
								re-arrange to split the async task into two and only wait on the user-blocking one  
							
							 
							
							
							
						 
						
							2020-01-21 16:57:07 +00:00  
						
					 
				
					
						
							
							
								 
								Zoe
							
						 
						
							 
							
							
								
								
							
							
								
							
								ec714283ca 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3888  from matrix-org/zip/11833-overlay-shields  
							
							 
							
							... 
							
							
							
							Move room header shields over the avatar for the room 
							
						 
						
							2020-01-21 16:56:09 +00:00  
						
					 
				
					
						
							
							
								 
								J. Ryan Stinnett
							
						 
						
							 
							
							
								
								
							
							
								
							
								2d8f33e9ee 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3890  from matrix-org/jryans/clipped-shield  
							
							 
							
							... 
							
							
							
							Fix toast icon to prevent clipping 
							
						 
						
							2020-01-21 16:52:19 +00:00