086e43e584 
								
							
								 
							
						 
						
							
							
								
								comments ftw  
							
							
							
						 
						
							2020-01-25 21:30:42 +00:00  
				
					
						
							
							
								 
						
							
							
								f851f976e7 
								
							
								 
							
						 
						
							
							
								
								Stop rogue verification toast if you verify during login  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/12057  
							
						 
						
							2020-01-25 21:26:43 +00:00  
				
					
						
							
							
								 
						
							
							
								9e38c62791 
								
							
								 
							
						 
						
							
							
								
								Show incoming verification requests in the 'complete security' phase  
							
							... 
							
							
							
							If you click to verify your new sign in on another device, actually
show the verification request on the 'complete security' screen. 
							
						 
						
							2020-01-25 20:42:45 +00:00  
				
					
						
							
							
								 
						
							
							
								7169a84449 
								
							
								 
							
						 
						
							
							
								
								Dismiss toasts for logged out devices  
							
							
							
						 
						
							2020-01-25 17:08:31 +00:00  
				
					
						
							
							
								 
						
							
							
								8c5fd5c77e 
								
							
								 
							
						 
						
							
							
								
								Verification nag toasts  
							
							... 
							
							
							
							Implement the three differenty cases for this session, and also fix
ones for other sessions which had the wrong copy.
Fixes https://github.com/vector-im/riot-web/issues/11220  
							
						 
						
							2020-01-25 16:52:12 +00:00  
				
					
						
							
							
								 
						
							
							
								988ae14d35 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3937  from matrix-org/dbkr/e2esetup  
							
							... 
							
							
							
							Setup flow for cross-signing on login / registration 
							
						 
						
							2020-01-25 12:40:17 +00:00  
				
					
						
							
							
								 
						
							
							
								204b7d3362 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3936  from matrix-org/jryans/hide-default-enc-algo  
							
							... 
							
							
							
							Hide default encryption algorithm 
							
						 
						
							2020-01-24 22:39:08 +00:00  
				
					
						
							
							
								 
						
							
							
								9991a544aa 
								
							
								 
							
						 
						
							
							
								
								Resolve default export warnings from Webpack  
							
							... 
							
							
							
							Webpack was printing several warnings about missing default exports,
particularly from components, where we auto-generate a default import via the
component index.
As part of this, the emoji picker recent handling (which is not a component) is
moved elsewhere to avoid the generated import. 
							
						 
						
							2020-01-24 22:26:34 +00:00  
				
					
						
							
							
								 
						
							
							
								3d7137d4ad 
								
							
								 
							
						 
						
							
							
								
								Setup flow for cross-signing on login / registration  
							
							... 
							
							
							
							Still outstanding:
 * Keep password from login / registration
 * Confirmation on skip button
Fixes https://github.com/vector-im/riot-web/issues/11902  
							
						 
						
							2020-01-24 19:11:57 +00:00  
				
					
						
							
							
								 
						
							
							
								bf0e1efce8 
								
							
								 
							
						 
						
							
							
								
								Hide default encryption algorithm  
							
							... 
							
							
							
							When the default encryption algorithm is used, we hide it to remove some jargon
from the app. For any other algorithm, we continue showing it and add
"unrecognised".
Fixes https://github.com/vector-im/riot-web/issues/8829  
							
						 
						
							2020-01-24 17:53:33 +00:00  
				
					
						
							
							
								 
						
							
							
								540a7f5c02 
								
							
								 
							
						 
						
							
							
								
								less duplication  
							
							
							
						 
						
							2020-01-24 09:41:47 -07:00  
				
					
						
							
							
								 
						
							
							
								91d59556db 
								
							
								 
							
						 
						
							
							
								
								Also check for our own key ID  
							
							
							
						 
						
							2020-01-24 09:37:12 -07:00  
				
					
						
							
							
								 
						
							
							
								f8e0dcf264 
								
							
								 
							
						 
						
							
							
								
								Add null check for cross-signing info in verification panel  
							
							
							
						 
						
							2020-01-24 09:33:55 -07:00  
				
					
						
							
							
								 
						
							
							
								169ca4a4da 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3926  from matrix-org/travis/event-tile-trace  
							
							... 
							
							
							
							Add trace logging to figure out which component is causing weird events 
							
						 
						
							2020-01-24 08:57:43 -07:00  
				
					
						
							
							
								 
						
							
							
								9722b34c35 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3906  from matrix-org/travis/user-lists-labs  
							
							... 
							
							
							
							Remove user lists feature flag, making it the default 
							
						 
						
							2020-01-24 08:57:27 -07:00  
				
					
						
							
							
								 
						
							
							
								abc2808b62 
								
							
								 
							
						 
						
							
							
								
								Fix i18n post-merge  
							
							
							
						 
						
							2020-01-24 08:57:03 -07:00  
				
					
						
							
							
								 
						
							
							
								5f2df15987 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/invite-polish  
							
							
							
						 
						
							2020-01-24 08:56:18 -07:00  
				
					
						
							
							
								 
						
							
							
								eb2402609a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3871  from matrix-org/travis/qr-verif-rp  
							
							... 
							
							
							
							QR code verification 
							
						 
						
							2020-01-24 08:55:40 -07:00  
				
					
						
							
							
								 
						
							
							
								543be90eda 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3931  from matrix-org/foldleft/12035-room-decoration-design-pass  
							
							... 
							
							
							
							Design pass for room icons 
							
						 
						
							2020-01-24 13:54:51 +00:00  
				
					
						
							
							
								 
						
							
							
								cbfde4d78f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'poljar/seshat-filepanel' into develop  
							
							
							
						 
						
							2020-01-24 14:44:24 +01:00  
				
					
						
							
							
								 
						
							
							
								75da5b7944 
								
							
								 
							
						 
						
							
							
								
								Design pass for room icons  
							
							
							
						 
						
							2020-01-24 13:37:47 +00:00  
				
					
						
							
							
								 
						
							
							
								7de5f09f9f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3928  from matrix-org/dbkr/split_out_asyncwrapper  
							
							... 
							
							
							
							Split AsyncWrapper out from Modal 
							
						 
						
							2020-01-24 13:31:09 +00:00  
				
					
						
							
							
								 
						
							
							
								330f606513 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3930  from matrix-org/bwindels/fixnoroom  
							
							... 
							
							
							
							Fix error in verification code on develop 
							
						 
						
							2020-01-24 13:30:25 +00:00  
				
					
						
							
							
								 
						
							
							
								131aacd3ab 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3929  from matrix-org/zip/11840-tooltips-on-padlocks  
							
							... 
							
							
							
							Seperates out the padlock icon, and adds a tooltip 
							
						 
						
							2020-01-24 13:26:59 +00:00  
				
					
						
							
							
								 
						
							
							
								37f289b120 
								
							
								 
							
						 
						
							
							
								
								EventIndex: Add docstrings for the FilePanel methods.  
							
							
							
						 
						
							2020-01-24 14:24:25 +01:00  
				
					
						
							
							
								 
						
							
							
								3534cd4202 
								
							
								 
							
						 
						
							
							
								
								FilePanel: Add comments to explain what's going on with the event index.  
							
							
							
						 
						
							2020-01-24 14:23:43 +01:00  
				
					
						
							
							
								 
						
							
							
								66768416a6 
								
							
								 
							
						 
						
							
							
								
								dont assume the room exist ... not sure why though  
							
							
							
						 
						
							2020-01-24 14:20:48 +01:00  
				
					
						
							
							
								 
						
							
							
								2c40b73ff6 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3910  from matrix-org/t3chguy/cross-signing-composer  
							
							... 
							
							
							
							Cross Signing redesign for composer 
							
						 
						
							2020-01-24 13:18:09 +00:00  
				
					
						
							
							
								 
						
							
							
								590ff29e60 
								
							
								 
							
						 
						
							
							
								
								Unused import  
							
							
							
						 
						
							2020-01-24 13:15:57 +00:00  
				
					
						
							
							
								 
						
							
							
								c5ecd83bc1 
								
							
								 
							
						 
						
							
							
								
								remove .orig file  
							
							
							
						 
						
							2020-01-24 12:34:50 +00:00  
				
					
						
							
							
								 
						
							
							
								dbf1c9a02a 
								
							
								 
							
						 
						
							
							
								
								Apparently i18n...  
							
							
							
						 
						
							2020-01-24 12:34:03 +00:00  
				
					
						
							
							
								 
						
							
							
								688f7029d2 
								
							
								 
							
						 
						
							
							
								
								Split AsyncWrapper out from Modal  
							
							... 
							
							
							
							So we can use it outside of modals & dialogs 
							
						 
						
							2020-01-24 12:28:03 +00:00  
				
					
						
							
							
								 
						
							
							
								a6fcbcacf6 
								
							
								 
							
						 
						
							
							
								
								Seperates out the padlock icon, and adds a tooltip  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/11840  
							
						 
						
							2020-01-24 12:06:21 +00:00  
				
					
						
							
							
								 
						
							
							
								b66154330c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3927  from matrix-org/bwindels/fixverifyowndevice  
							
							... 
							
							
							
							Fix verifying your own devices with to_device messages 
							
						 
						
							2020-01-24 11:24:33 +00:00  
				
					
						
							
							
								 
						
							
							
								1d686fe49e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3908  from matrix-org/zip/11935-room-list-decoration  
							
							... 
							
							
							
							Room list reflects encryption state 
							
						 
						
							2020-01-24 11:14:53 +00:00  
				
					
						
							
							
								 
						
							
							
								6cce65a2a5 
								
							
								 
							
						 
						
							
							
								
								fix lint  
							
							
							
						 
						
							2020-01-24 12:08:47 +01:00  
				
					
						
							
							
								 
						
							
							
								ecfecfe559 
								
							
								 
							
						 
						
							
							
								
								EventIndex: Fix a small style issue.  
							
							
							
						 
						
							2020-01-24 12:07:03 +01:00  
				
					
						
							
							
								 
						
							
							
								395c82b1e5 
								
									
								
							
								 
							
						 
						
							
							
								
								Update src/components/structures/RoomView.js  
							
							... 
							
							
							
							Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com> 
							
						 
						
							2020-01-24 11:04:40 +00:00  
				
					
						
							
							
								 
						
							
							
								512bd4b0b2 
								
							
								 
							
						 
						
							
							
								
								show to_device verification in dialog, not right panel  
							
							... 
							
							
							
							this also makes it work again, as the VerificationPanel doens't
know how to deal with requests that are already in PHASE_STARTED,
which was breaking verifying your own devices. 
							
						 
						
							2020-01-24 11:59:17 +01:00  
				
					
						
							
							
								 
						
							
							
								2483337e89 
								
							
								 
							
						 
						
							
							
								
								don't use removed .event property anymore on verification request  
							
							
							
						 
						
							2020-01-24 11:59:01 +01:00  
				
					
						
							
							
								 
						
							
							
								0078c2f099 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3914  from matrix-org/t3chguy/userinfo_scroll  
							
							... 
							
							
							
							Make the entire User Info scrollable, sticky close button 
							
						 
						
							2020-01-24 10:22:17 +00:00  
				
					
						
							
							
								 
						
							
							
								b72ab57e1b 
								
							
								 
							
						 
						
							
							
								
								add <Tooltip/> to <E2EIcon/>  
							
							
							
						 
						
							2020-01-24 10:13:03 +00:00  
				
					
						
							
							
								 
						
							
							
								50b05551ba 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3916  from matrix-org/dbkr/security_dialog_noheader  
							
							... 
							
							
							
							Remove riot logo from the security setup screens 
							
						 
						
							2020-01-24 09:50:25 +00:00  
				
					
						
							
							
								 
						
							
							
								81caa12b16 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3917  from matrix-org/dbkr/complete_security_detect_success  
							
							... 
							
							
							
							Only say the session is verified if it is now verified 
							
						 
						
							2020-01-24 09:38:25 +00:00  
				
					
						
							
							
								 
						
							
							
								99252e08b0 
								
							
								 
							
						 
						
							
							
								
								Unintentional commit  
							
							
							
						 
						
							2020-01-24 09:37:43 +00:00  
				
					
						
							
							
								 
						
							
							
								cd4e75c378 
								
							
								 
							
						 
						
							
							
								
								Unnecessary blank line  
							
							
							
						 
						
							2020-01-24 09:36:22 +00:00  
				
					
						
							
							
								 
						
							
							
								12fa94106e 
								
							
								 
							
						 
						
							
							
								
								Actually add the secret to the QR code url  
							
							
							
						 
						
							2020-01-23 20:19:17 -07:00  
				
					
						
							
							
								 
						
							
							
								b7e680ba51 
								
							
								 
							
						 
						
							
							
								
								Fix key ID  
							
							
							
						 
						
							2020-01-23 20:14:27 -07:00  
				
					
						
							
							
								 
						
							
							
								0ce9da5d36 
								
							
								 
							
						 
						
							
							
								
								Appease the linter  
							
							
							
						 
						
							2020-01-23 20:12:24 -07:00  
				
					
						
							
							
								 
						
							
							
								ebcc4d573b 
								
							
								 
							
						 
						
							
							
								
								Add trace logging to figure out which component is causing weird events  
							
							... 
							
							
							
							For https://github.com/vector-im/riot-web/issues/11120  
							
						 
						
							2020-01-23 20:10:31 -07:00