df7c32187b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4538  from matrix-org/dbkr/wait_for_user_verified_rel  
							
							... 
							
							
							
							Wait for user to be verified in e2e setup 
							
						 
						
							2020-05-01 11:41:13 +01:00  
				
					
						
							
							
								 
						
							
							
								a04564d1e3 
								
							
								 
							
						 
						
							
							
								
								Guard against race when waiting for cross-signing to be ready  
							
							... 
							
							
							
							Check to see if cross-signing is already set up after a verification
is done to make sure it doesn't race and we end up waiting forever. 
							
						 
						
							2020-05-01 11:26:54 +01:00  
				
					
						
							
							
								 
						
							
							
								4377e4161f 
								
							
								 
							
						 
						
							
							
								
								Clear more state in DeviceListener  
							
							... 
							
							
							
							Especially the devices at start, otherwise they'll just be wrong
if you log in after logging out. 
							
						 
						
							2020-05-01 10:42:10 +01:00  
				
					
						
							
							
								 
						
							
							
								a291f6c2c5 
								
							
								 
							
						 
						
							
							
								
								Wait for user to be verified in e2e setup  
							
							... 
							
							
							
							Wait for our user to become verified and cross-signing to be ready
before declaring that we're finsihed, otherwise we could end up
prompting the user to verify again if we just wait for the verification
itself to complete.
Fixes part of https://github.com/vector-im/riot-web/issues/13464  
							
						 
						
							2020-05-01 10:42:05 +01:00  
				
					
						
							
							
								 
						
							
							
								0cb7573643 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4536  from matrix-org/dbkr/a_toast_to_you_sir_rel  
							
							... 
							
							
							
							Add device name to unverified session toast 
							
						 
						
							2020-04-30 16:37:10 +01:00  
				
					
						
							
							
								 
						
							
							
								6ef5b78806 
								
							
								 
							
						 
						
							
							
								
								Add device name to unverified session toast  
							
							
							
						 
						
							2020-04-30 16:10:46 +01:00  
				
					
						
							
							
								 
						
							
							
								619fbd6adc 
								
							
								 
							
						 
						
							
							
								
								v2.5.0-rc.5  
							
							
							
						 
						
							2020-04-30 11:30:14 +01:00  
				
					
						
							
							
								 
						
							
							
								b7f2c7b813 
								
							
								 
							
						 
						
							
							
								
								Prepare changelog for v2.5.0-rc.5  
							
							
							
						 
						
							2020-04-30 11:30:13 +01:00  
				
					
						
							
							
								 
						
							
							
								5a29bf569d 
								
							
								 
							
						 
						
							
							
								
								Upgrade matrix-js-sdk to 6.0.0-rc.1  
							
							
							
						 
						
							2020-04-30 11:21:33 +01:00  
				
					
						
							
							
								 
						
							
							
								19d0bf0d3b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4533  from matrix-org/dbkr/remove_unnecessary_return_rel  
							
							... 
							
							
							
							Fix device verification toasts not disappearing 
							
						 
						
							2020-04-30 11:13:21 +01:00  
				
					
						
							
							
								 
						
							
							
								4f95c89ffc 
								
							
								 
							
						 
						
							
							
								
								Fix device verification toasts not disappearing  
							
							... 
							
							
							
							recheck in DeviceListener returned early if cross-signing wasn't
ready, but this was unnecessary and prevented it from hiding the
device verification toasts (which also appeared above the toast
to verify yourself). 
							
						 
						
							2020-04-30 11:05:31 +01:00  
				
					
						
							
							
								 
						
							
							
								db36b7e1d5 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4526  from matrix-org/jryans/reset-from-access-rc  
							
							... 
							
							
							
							Allow resetting storage from the access dialog 
							
						 
						
							2020-04-30 10:17:12 +01:00  
				
					
						
							
							
								 
						
							
							
								3d996a91a7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4530  from matrix-org/dbkr/toast_copy_update_again_rel  
							
							... 
							
							
							
							Update toast copy again 
							
						 
						
							2020-04-30 10:01:25 +01:00  
				
					
						
							
							
								 
						
							
							
								aa9da54bed 
								
							
								 
							
						 
						
							
							
								
								yarn i18n  
							
							
							
						 
						
							2020-04-30 09:45:11 +01:00  
				
					
						
							
							
								 
						
							
							
								c97eab24c7 
								
							
								 
							
						 
						
							
							
								
								Update toast copy again  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/13447  
							
						 
						
							2020-04-29 19:08:08 +01:00  
				
					
						
							
							
								 
						
							
							
								7af2d27ced 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4528  from matrix-org/dbkr/longtoast_is_no_longer_long_rel  
							
							... 
							
							
							
							Reduce maximum width of toasts & allow multiple lines 
							
						 
						
							2020-04-29 18:14:26 +01:00  
				
					
						
							
							
								 
						
							
							
								6b04ae2cf6 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4527  from matrix-org/dbkr/sessions_there_on_login_are_old_rel  
							
							... 
							
							
							
							Treat sessions that are there when we log in as old 
							
						 
						
							2020-04-29 18:14:19 +01:00  
				
					
						
							
							
								 
						
							
							
								189a78d184 
								
							
								 
							
						 
						
							
							
								
								Put overflows back  
							
							
							
						 
						
							2020-04-29 18:08:54 +01:00  
				
					
						
							
							
								 
						
							
							
								ba233dc372 
								
							
								 
							
						 
						
							
							
								
								Reduce maximum width of toasts & allow multiple lines  
							
							
							
						 
						
							2020-04-29 18:08:48 +01:00  
				
					
						
							
							
								 
						
							
							
								38124ba9d0 
								
							
								 
							
						 
						
							
							
								
								Comment typo  
							
							... 
							
							
							
							Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com> 
							
						 
						
							2020-04-29 17:45:35 +01:00  
				
					
						
							
							
								 
						
							
							
								19170945b1 
								
							
								 
							
						 
						
							
							
								
								Treat sessions that are there when we log in as old  
							
							... 
							
							
							
							Use the bulk 'review' toast for sessions that existed at the time
of login, rather than considering them all to be new.
Also cheeky unrelated proptypes fix.
Fixes https://github.com/vector-im/riot-web/issues/13443 
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1360  
							
						 
						
							2020-04-29 17:45:28 +01:00  
				
					
						
							
							
								 
						
							
							
								e3da750de0 
								
							
								 
							
						 
						
							
							
								
								Allow resetting storage from the access dialog  
							
							... 
							
							
							
							This adds a path to reset secret storage from the access dialog instead of
throwing an error.
Fixes https://github.com/vector-im/riot-web/issues/13436  
							
						 
						
							2020-04-29 17:43:05 +01:00  
				
					
						
							
							
								 
						
							
							
								de9c8b0537 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4523  from matrix-org/dbkr/toast_copy_again_rel  
							
							... 
							
							
							
							Update (bulk) unverified device toast copy 
							
						 
						
							2020-04-29 16:02:56 +01:00  
				
					
						
							
							
								 
						
							
							
								d691386ef0 
								
							
								 
							
						 
						
							
							
								
								Lint  
							
							
							
						 
						
							2020-04-29 15:56:01 +01:00  
				
					
						
							
							
								 
						
							
							
								691066af94 
								
							
								 
							
						 
						
							
							
								
								Update (bulk) unverified device toast copy  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/13444  
							
						 
						
							2020-04-29 15:32:56 +01:00  
				
					
						
							
							
								 
						
							
							
								33390e3659 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4520  from matrix-org/dbkr/new_device_toast_more_important_rel  
							
							... 
							
							
							
							Make new device toasts appear above review toasts 
							
						 
						
							2020-04-29 15:28:35 +01:00  
				
					
						
							
							
								 
						
							
							
								58c0cfe315 
								
							
								 
							
						 
						
							
							
								
								Add jsdoc explaining ordering behaviour  
							
							
							
						 
						
							2020-04-29 15:18:49 +01:00  
				
					
						
							
							
								 
						
							
							
								e9214f7d13 
								
							
								 
							
						 
						
							
							
								
								Make new device toasts appear above review toasts  
							
							... 
							
							
							
							...but below incoming verification toasts, which means we now need
to actually handle priority insertion correctly. Oh well.
Fixes https://github.com/vector-im/riot-web/issues/13442  
							
						 
						
							2020-04-29 15:18:43 +01:00  
				
					
						
							
							
								 
						
							
							
								87669f4ff7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4517  from matrix-org/dbkr/another_round_of_toast_rel  
							
							... 
							
							
							
							Separate toasts for existing & new device verification 
							
						 
						
							2020-04-29 12:50:06 +01:00  
				
					
						
							
							
								 
						
							
							
								dfc1c5e627 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4516  from matrix-org/dbkr/aggregate_device_verify_toasts_rel  
							
							... 
							
							
							
							Aggregate device verify toasts 
							
						 
						
							2020-04-29 12:49:50 +01:00  
				
					
						
							
							
								 
						
							
							
								5eb86c0d6a 
								
							
								 
							
						 
						
							
							
								
								Comment typo  
							
							... 
							
							
							
							Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com> 
							
						 
						
							2020-04-29 12:37:34 +01:00  
				
					
						
							
							
								 
						
							
							
								690e934b27 
								
							
								 
							
						 
						
							
							
								
								Remove await for some more getStoredDevice() calls  
							
							
							
						 
						
							2020-04-29 12:37:29 +01:00  
				
					
						
							
							
								 
						
							
							
								8aa5d762db 
								
							
								 
							
						 
						
							
							
								
								Clarify that we don't need tyo recheck  
							
							
							
						 
						
							2020-04-29 12:37:22 +01:00  
				
					
						
							
							
								 
						
							
							
								e67faa15ca 
								
							
								 
							
						 
						
							
							
								
								s/unverified/new/  
							
							
							
						 
						
							2020-04-29 12:37:17 +01:00  
				
					
						
							
							
								 
						
							
							
								9cbc407305 
								
							
								 
							
						 
						
							
							
								
								Add the other toast component  
							
							
							
						 
						
							2020-04-29 12:37:10 +01:00  
				
					
						
							
							
								 
						
							
							
								0f9d3f555e 
								
							
								 
							
						 
						
							
							
								
								Separate toasts for existing & new device verification  
							
							... 
							
							
							
							Separate device verification toasts into ones for devices that were
there when the app loaded and a separate toast for each device that
has appeared since.
Reverts part of https://github.com/matrix-org/matrix-react-sdk/pull/4506 
(clicking a device from your own UserInfo now triggers the legacy
verification flow again).
Fixes https://github.com/vector-im/riot-web/issues/13422 
Fixes https://github.com/vector-im/riot-web/issues/13418  
							
						 
						
							2020-04-29 12:37:05 +01:00  
				
					
						
							
							
								 
						
							
							
								81d91721d8 
								
							
								 
							
						 
						
							
							
								
								Consts are constant  
							
							
							
						 
						
							2020-04-29 12:35:23 +01:00  
				
					
						
							
							
								 
						
							
							
								f7c881a462 
								
							
								 
							
						 
						
							
							
								
								No need for this if statement now  
							
							
							
						 
						
							2020-04-29 12:35:17 +01:00  
				
					
						
							
							
								 
						
							
							
								7da2850a2e 
								
							
								 
							
						 
						
							
							
								
								No need for a set here - bool is fine  
							
							
							
						 
						
							2020-04-29 12:35:11 +01:00  
				
					
						
							
							
								 
						
							
							
								3e6a623270 
								
							
								 
							
						 
						
							
							
								
								Lint  
							
							
							
						 
						
							2020-04-29 12:35:02 +01:00  
				
					
						
							
							
								 
						
							
							
								996f8af365 
								
							
								 
							
						 
						
							
							
								
								Use the New Session review dialog for verifying our own devices  
							
							
							
						 
						
							2020-04-29 12:34:54 +01:00  
				
					
						
							
							
								 
						
							
							
								0edb80e541 
								
							
								 
							
						 
						
							
							
								
								Make close button work from user info view  
							
							... 
							
							
							
							Adds more hacks so that the close button does something vagauely
plausible in all situations. 
							
						 
						
							2020-04-29 12:34:48 +01:00  
				
					
						
							
							
								 
						
							
							
								e5d06b1acb 
								
							
								 
							
						 
						
							
							
								
								Aggregate device verification toasts into one toast  
							
							... 
							
							
							
							'Review' now opens the only place we can verify our own devices:
our user info. 
							
						 
						
							2020-04-29 12:34:43 +01:00  
				
					
						
							
							
								 
						
							
							
								698a539866 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4515  from matrix-org/jryans/set-up-button-text-rc  
							
							... 
							
							
							
							Fix set up encryption toast to use "set up" as action 
							
						 
						
							2020-04-29 11:09:09 +01:00  
				
					
						
							
							
								 
						
							
							
								bdeb788be9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4512  from matrix-org/t3chguy/cherry-pick/4  
							
							... 
							
							
							
							Fix internal link styling in Security Settings 
							
						 
						
							2020-04-29 10:59:24 +01:00  
				
					
						
							
							
								 
						
							
							
								736857ffdf 
								
							
								 
							
						 
						
							
							
								
								Fix set up encryption toast to use "set up" as action  
							
							... 
							
							
							
							This changes the "set up encryption" toast to use "set up" as the primary action
button, instead of "upgrade". Other toasts that do use text about upgrading will
keep their primary action text of "upgrade" as before.
Fixes https://github.com/vector-im/riot-web/issues/13231  
							
						 
						
							2020-04-29 10:58:55 +01:00  
				
					
						
							
							
								 
						
							
							
								da52a16ff4 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4513  from matrix-org/bwindels/dontencryptfor3pids-rc  
							
							... 
							
							
							
							Don't enable e2ee when inviting a 3pid 
							
						 
						
							2020-04-29 09:58:38 +00:00  
				
					
						
							
							
								 
						
							
							
								c10969f520 
								
							
								 
							
						 
						
							
							
								
								enable encryption when NOT inviting 3pids  
							
							
							
						 
						
							2020-04-29 11:46:04 +02:00  
				
					
						
							
							
								 
						
							
							
								a8205d21f1 
								
							
								 
							
						 
						
							
							
								
								targets can also contain RoomMember, so take the positive case rather  
							
							
							
						 
						
							2020-04-29 11:46:04 +02:00  
				
					
						
							
							
								 
						
							
							
								be13e86b09 
								
							
								 
							
						 
						
							
							
								
								dont enable e2ee when inviting a 3pid  
							
							
							
						 
						
							2020-04-29 11:46:04 +02:00