Merge remote-tracking branch 'origin/develop' into dbkr/wasm

This commit is contained in:
David Baker 2018-10-02 16:58:31 +01:00
commit 30f0a7932b
19 changed files with 12289 additions and 4528 deletions

View file

@ -267,7 +267,9 @@ async function loadApp() {
// don't try to redirect to the native apps if we're
// verifying a 3pid (but after we've loaded the config)
const preventRedirect = Boolean(fragparts.params.client_secret);
// or if the user is following a deep link
// (https://github.com/vector-im/riot-web/issues/7378)
const preventRedirect = fragparts.params.client_secret || fragparts.location.length > 0;
if (!preventRedirect) {
const isIos = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;