ed7f0fd95f
This promise doesn't exist anymore
2020-06-05 18:08:25 +01:00
7c59e39710
Sort out what we wait for after login
...
We were waiting only for the client to become logged in rather than
for setLoggedIn() to finish but then we were waiting for the first
sync to complete which is far longer. We need setLoggedIn to have
finished for crypto to be set up so we can query cross-signing keys,
so just wait for that anyway, the logic becomes a lot simpler and
we're waiting the same amount of time because we have to wait for
the first sync to finish. We can also download keys in parallel.
2020-06-05 17:52:09 +01:00
68e555a0c6
Support accounts with cross signing but no SSSS
...
At least at the login stage.
Fixes https://github.com/vector-im/riot-web/issues/13894
2020-06-05 16:40:20 +01:00
b82a893a79
Merge remote-tracking branch 'origin/develop' into dbkr/recovery_keys_over_passphrases
2020-06-05 16:00:43 +01:00
d54308a8c6
Reset matrix-js-sdk back to develop branch
2020-06-05 15:48:06 +01:00
1d6141cf73
Merge branch 'master' into develop
2020-06-05 15:47:23 +01:00
c8366b7a47
v2.7.1
2020-06-05 15:43:24 +01:00
94059b8524
Prepare changelog for v2.7.1
2020-06-05 15:43:23 +01:00
68623b43b1
Merge branch 'release-v2.7.1' of github.com:matrix-org/matrix-react-sdk into release-v2.7.1
2020-06-05 15:35:34 +01:00
b49d437ee8
Merge pull request #4716 from matrix-org/t3chguy/1.6.4/r3
...
Fix exceptions from Tooltip
2020-06-05 15:33:50 +01:00
93ed062900
Fix exceptions from Tooltip
...
renderTooltip was not a bound function and so was failing to find
the parent when called from the 'scroll' event listener because
'this' was the window object rather than the Tooltip object.
Unsure at what point this broke - I assumed it was in thr recent
typescript conversion but it looks like it would have had the same
problem before.
(cherry picked from commit 5e569d75b6
2020-06-05 15:20:49 +01:00
e78fa602c0
Upgrade matrix-js-sdk to 6.2.1
2020-06-05 15:13:55 +01:00
455b915143
Merge pull request #4715 from matrix-org/t3chguy/1.6.4/r2
...
Fix not being able to dismiss new login toasts
2020-06-05 11:34:06 +01:00
04e6112dfb
Merge pull request #4714 from matrix-org/t3chguy/1.6.4/r1
...
Fix compact layout regression
2020-06-05 11:31:42 +01:00
ab9284fced
Fix not being able to dismiss new login toasts
...
`toastKey` is a thing.
Fixes https://github.com/vector-im/riot-web/issues/13923
(cherry picked from commit c667ea69af
2020-06-05 11:24:22 +01:00
0dc788eaa7
Fix compact layout regression
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit f4f23dba04
2020-06-05 11:22:33 +01:00
f221e06068
Merge pull request #4712 from matrix-org/t3chguy/compact-mode
...
Fix compact layout regression
2020-06-05 11:02:59 +01:00
f4f23dba04
Fix compact layout regression
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-05 10:53:00 +01:00
02cdc8a201
Merge pull request #4710 from matrix-org/matthew/fix-safari-emoji
...
fix emoji in safari
2020-06-04 22:07:18 +01:00
c171bdfec7
fix emoji in safari
...
1. emoji sometimes vanished from the autocompleter due to a rounding error
combined with maxWidth: 1em on the emoji span kicking in at arbitrary
font sizes/zooms
2. apparently safari needs explicit VS-16 ligatures, as per
ff7dec427f
2020-06-04 22:01:16 +01:00
3fff46b0c7
Merge pull request #4709 from matrix-org/travis/later
...
Fix not being able to dismiss new login toasts
2020-06-04 14:12:21 -06:00
dc23dd637c
Revert "Add a warning for dismissing invalid toasts"
...
This reverts commit 3674b6446e
2020-06-04 14:07:06 -06:00
3674b6446e
Add a warning for dismissing invalid toasts
2020-06-04 13:53:09 -06:00
c667ea69af
Fix not being able to dismiss new login toasts
...
`toastKey` is a thing.
Fixes https://github.com/vector-im/riot-web/issues/13923
2020-06-04 13:48:35 -06:00
ddc9c67a8b
Merge pull request #4708 from matrix-org/dbkr/bind_tooltip_render
...
Fix exceptions from Tooltip
2020-06-04 19:29:56 +01:00
5e569d75b6
Fix exceptions from Tooltip
...
renderTooltip was not a bound function and so was failing to find
the parent when called from the 'scroll' event listener because
'this' was the window object rather than the Tooltip object.
Unsure at what point this broke - I assumed it was in thr recent
typescript conversion but it looks like it would have had the same
problem before.
2020-06-04 17:54:18 +01:00
88c325afa4
Merge pull request #4707 from tulir/patch-1
...
Stop removing variation selector from quick reactions
2020-06-04 17:41:15 +01:00
46b282142f
Stop removing variation selector from quick reactions
...
Fixes vector-im/riot-web#13926
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2020-06-04 18:58:13 +03:00
3c73930e9a
Reset matrix-js-sdk back to develop branch
2020-06-04 15:14:34 +01:00
260d448db6
Merge branch 'master' into develop
2020-06-04 15:13:41 +01:00
65e59fd708
v2.7.0
2020-06-04 15:12:24 +01:00
5aff8f7915
Prepare changelog for v2.7.0
2020-06-04 15:12:23 +01:00
07a12a73ee
Upgrade matrix-js-sdk to 6.2.0
2020-06-04 15:06:40 +01:00
920e087ada
Merge pull request #4704 from matrix-org/t3chguy/continuation
...
Tidy up continuation algorithm and make it work for hidden profile changes
2020-06-04 13:59:13 +01:00
4043989a25
Merge pull request #4699 from matrix-org/t3chguy/fix-own-displayname
...
Profile settings should never show a disambiguated display name
2020-06-04 13:50:15 +01:00
737c31a54c
Merge pull request #4703 from matrix-org/bwindels/preventbootstrapfromkeybackuprestore-rc
...
Prevent (double) 4S bootstrap from RestoreKeyBackupDialog
2020-06-04 12:37:48 +00:00
6d81337d92
Tidy up continuation algorithm and make it work for hidden profile change events
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-04 13:10:45 +01:00
77b012e49b
Merge pull request #4701 from matrix-org/bwindels/preventbootstrapfromkeybackuprestore
...
Prevent (double) 4S bootstrap from RestoreKeyBackupDialog
2020-06-04 12:07:19 +00:00
40cabd2589
When trying to restore a keyback that has its key in 4S, check if 4S will be readable
...
If the account data for the 4S key is cleared or lost somehow, don't attempt to
read the key and ask for the passphrase/recovery key instead, as doing so would trigger another
bootstrap from the restore key backup dialog, overwriting the existing key backup.
2020-06-04 14:03:48 +02:00
4e623fa8c0
Merge pull request #4702 from matrix-org/jryans/release-4691
...
Fix checkbox bleed
2020-06-04 12:11:20 +01:00
ca69a9d7bb
Fix checkbox bleed
2020-06-04 12:03:18 +01:00
07e0cab4a8
When trying to restore a keyback that has its key in 4S, check if 4S will be readable
...
If the account data for the 4S key is cleared or lost somehow, don't attempt to
read the key and ask for the passphrase/recovery key instead, as doing so would trigger another
bootstrap from the restore key backup dialog, overwriting the existing key backup.
2020-06-04 12:52:20 +02:00
aec588dada
Merge pull request #4691 from JorikSchellekens/joriks/fix-addressselector-dropdown-checkbox-overlap
...
Stop checkbox styling bleeding through room address selector
2020-06-04 09:16:45 +00:00
993a545cd2
Profile settings should never show a disambiguated display name
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-04 09:50:19 +01:00
e6a776be7e
Merge pull request #4693 from matrix-org/t3chguy/sso-query
...
Fix login loop where the sso flow returns to `#/login` to release
2020-06-04 01:09:30 +01:00
bde327e1e6
Merge pull request #4695 from aaronraimist/center-headerbuttons
...
Center HeaderButtons
2020-06-04 00:36:23 +01:00
a4c9a67325
Delete files.png and change UploadConfirmDialog to use svg used elsewhere
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-06-03 17:23:37 -05:00
711ddd42c9
Remove some unused images
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-06-03 17:23:37 -05:00
3b5de137c4
Center HeaderButtons
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-06-03 17:23:23 -05:00
096045a037
change names of consts for clarity
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-03 22:15:01 +01:00
David Baker