098d097922 
								
							
								 
							
						 
						
							
							
								
								Re-enable stylelint on CI  
							
							
							
						 
						
							2020-01-24 14:03:31 +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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								d3960b8c54 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3924  from matrix-org/travis/sso-pw  
							
							... 
							
							
							
							Hide password section if you can't change your password 
							
						 
						
							2020-01-23 16:43:01 -07:00  
				
					
						
							
							
								 
						
							
							
								1394331133 
								
							
								 
							
						 
						
							
							
								
								Fix booleans  
							
							
							
						 
						
							2020-01-23 16:33:33 -07:00  
				
					
						
							
							
								 
						
							
							
								c22bfa84b7 
								
							
								 
							
						 
						
							
							
								
								Hide password section if you can't change your password  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/11950  
							
						 
						
							2020-01-23 16:29:55 -07:00  
				
					
						
							
							
								 
						
							
							
								beb2503542 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3922  from matrix-org/travis/fix-copy  
							
							... 
							
							
							
							Ensure a plaintext version of the composer ends up on the clipboard 
							
						 
						
							2020-01-23 16:02:52 -07:00  
				
					
						
							
							
								 
						
							
							
								915c4efeac 
								
							
								 
							
						 
						
							
							
								
								Ensure a plaintext version of the composer ends up on the clipboard  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/12018  
							
						 
						
							2020-01-23 15:53:32 -07:00  
				
					
						
							
							
								 
						
							
							
								40cb9e5dd9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3920  from matrix-org/travis/fix-build  
							
							... 
							
							
							
							Move & upgrade babel runtime into dependencies (like it wants) 
							
						 
						
							2020-01-23 15:46:11 -07:00  
				
					
						
							
							
								 
						
							
							
								4aa3be9b42 
								
							
								 
							
						 
						
							
							
								
								Move & upgrade babel runtime into dependencies (like it wants)  
							
							... 
							
							
							
							https://babeljs.io/docs/en/babel-runtime  
						
							2020-01-23 15:43:22 -07:00  
				
					
						
							
							
								 
						
							
							
								ed93761b00 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3918  from matrix-org/travis/aliases  
							
							... 
							
							
							
							Don't list every single alias when there's many 
							
						 
						
							2020-01-23 15:09:08 -07:00  
				
					
						
							
							
								 
						
							
							
								18f8f8858c 
								
							
								 
							
						 
						
							
							
								
								Don't list every single alias when there's many  
							
							
							
						 
						
							2020-01-23 15:00:18 -07:00  
				
					
						
							
							
								 
						
							
							
								1ac82a9f16 
								
							
								 
							
						 
						
							
							
								
								Revert "Don't list every single alias when there's many"  
							
							... 
							
							
							
							This reverts commit 6fc647c3d9 
							
						 
						
							2020-01-23 15:00:02 -07:00  
				
					
						
							
							
								 
						
							
							
								6fc647c3d9 
								
							
								 
							
						 
						
							
							
								
								Don't list every single alias when there's many  
							
							
							
						 
						
							2020-01-23 14:59:52 -07:00  
				
					
						
							
							
								 
						
							
							
								6be0cb92ff 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3907  from matrix-org/travis/user-lists-suggestions  
							
							... 
							
							
							
							Try to populate user IDs even when the server's directory fails us 
							
						 
						
							2020-01-23 14:49:27 -07:00  
				
					
						
							
							
								 
						
							
							
								74b678d0ff 
								
							
								 
							
						 
						
							
							
								
								Only say the session is verified if it is now verified  
							
							
							
						 
						
							2020-01-23 19:19:12 +00:00  
				
					
						
							
							
								 
						
							
							
								a3026277c1 
								
							
								 
							
						 
						
							
							
								
								Unused variable  
							
							
							
						 
						
							2020-01-23 18:24:03 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								ce32c12303 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3912  from matrix-org/bwindels/verifyowndevicechecks  
							
							... 
							
							
							
							Remove .event property on verification request 
							
						 
						
							2020-01-23 17:02:00 +00:00  
				
					
						
							
							
								 
						
							
							
								661b2415d6 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3911  from matrix-org/t3chguy/a11y_tweak  
							
							... 
							
							
							
							Attempt to fix Safari + VoiceOver misunderstanding the timeline list 
							
						 
						
							2020-01-23 16:27:58 +00:00  
				
					
						
							
							
								 
						
							
							
								e3027d3086 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3913  from matrix-org/jryans/negotiate-e2e-dms  
							
							... 
							
							
							
							Enable encryption in DMs with device keys 
							
						 
						
							2020-01-23 16:23:59 +00:00  
				
					
						
							
							
								 
						
							
							
								237a0ed071 
								
							
								 
							
						 
						
							
							
								
								Make the entire User Info scrollable, sticky close button  
							
							
							
						 
						
							2020-01-23 16:09:32 +00:00  
				
					
						
							
							
								 
						
							
							
								a566c74e39 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3905  from matrix-org/travis/user-lists-final  
							
							... 
							
							
							
							Fix scrollable area and padding in user lists dialog 
							
						 
						
							2020-01-23 09:04:40 -07:00  
				
					
						
							
							
								 
						
							
							
								1e25b32ba3 
								
							
								 
							
						 
						
							
							
								
								Enable encryption in DMs with device keys  
							
							... 
							
							
							
							When the cross-signing lab is enabled, this changes DMs to use encryption as
long as all invited users have uploaded device keys (which we're using as a
proxy for "has some client that understands E2E").
Fixes https://github.com/vector-im/riot-web/issues/12005  
							
						 
						
							2020-01-23 16:03:42 +00:00  
				
					
						
							
							
								 
						
							
							
								26aa4bb4f3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3909  from matrix-org/t3chguy/invite_reject_ignore  
							
							... 
							
							
							
							Add Reject & Ignore user button to invites view 
							
						 
						
							2020-01-23 14:59:19 +00:00  
				
					
						
							
							
								 
						
							
							
								8a523fbb59 
								
							
								 
							
						 
						
							
							
								
								remove this log line, so we can remove the .event property  
							
							... 
							
							
							
							this is likely the error Dave hit last week, because there was
no .request event set yet for some other reasons that have
been fixed already (the event being put in the wrong map, theirs
instead of us) in the VerificationRequest object. 
							
						 
						
							2020-01-23 15:53:54 +01:00  
				
					
						
							
							
								 
						
							
							
								604e244265 
								
							
								 
							
						 
						
							
							
								
								Attempt to fix Safari + VoiceOver misunderstanding the timeline list  
							
							
							
						 
						
							2020-01-23 14:53:41 +00:00  
				
					
						
							
							
								 
						
							
							
								e9dccd1460 
								
							
								 
							
						 
						
							
							
								
								moving icons exactly one pixel to the right and one pixel down  
							
							
							
						 
						
							2020-01-23 14:44:57 +00:00  
				
					
						
							
							
								 
						
							
							
								662b34c8db 
								
							
								 
							
						 
						
							
							
								
								Update MessageComposer placeholder and e2e icon size  
							
							
							
						 
						
							2020-01-23 14:38:39 +00:00  
				
					
						
							
							
								 
						
							
							
								74b08ea489 
								
							
								 
							
						 
						
							
							
								
								Clean up E2EIcon for better maintainability  
							
							
							
						 
						
							2020-01-23 14:38:17 +00:00