f4f23dba04
Fix compact layout regression
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-05 10:53:00 +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
84d81ff09b
Fix login loop where the sso flow returns to `#/login`
...
due to fragmentAfterLogin going back to `#/login`
and https://github.com/vector-im/riot-web/issues/11643
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-03 22:15:01 +01:00
eccacb1bc7
Merge pull request #4605 from matrix-org/t3chguy/e2eedefault
...
Add .well-known option to control default e2ee behaviour
2020-06-03 22:12:13 +01:00
b368856f2b
Merge pull request #4692 from aaronraimist/panel-max-width
...
Add max-width to right and left panels
2020-06-03 21:09:05 +01:00
92c28f089c
Add max-width to right and left panels
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-06-03 14:56:48 -05:00
10bdb4975e
Merge pull request #4685 from matrix-org/t3chguy/sso-query
...
Fix login loop where the sso flow returns to `#/login`
2020-06-03 20:28:01 +01:00
5b775fd63c
Merge pull request #4690 from matrix-org/t3chguy/mau-toasts
...
Don't clear MAU toasts when a successful sync comes in
2020-06-03 20:23:25 +01:00
899f9ede45
change names of consts for clarity
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-03 20:23:01 +01:00
380ba163e4
Merge pull request #4681 from matrix-org/travis/room-list/filtering
...
Add initial filtering support to new room list
2020-06-03 13:21:13 -06:00
5a4723d243
don't specify hs_disabled as its a Synapse special
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-03 20:13:32 +01:00
bc2fbefb5c
Remove iteratorToArray
2020-06-03 11:29:06 -06:00
013751e308
Merge pull request #4664 from matrix-org/foldleft/13523-hide-empty-verifications
...
Bubble up a decline-to-render of verification events to outside wrapper
2020-06-03 10:10:06 -06:00
3c922329fe
Merge pull request #4672 from matrix-org/matthew/emoji13
...
upgrade to twemoji 13.0.0
2020-06-03 17:09:32 +01:00
5bc756cba1
Fix checkbox bleed
2020-06-03 16:48:05 +01:00
9c417cfbad
Don't clear MAU toasts when a successful sync comes in
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-03 16:17:31 +01:00
030cc5cdea
Merge pull request #4666 from matrix-org/t3chguy/image-view-focuslock
...
Apply FocusLock to ImageView to capture Escape handling
2020-06-03 15:37:18 +01:00
caea153962
Merge pull request #4689 from matrix-org/dbkr/fix_complete_security
...
Fix the 'complete security' screen
2020-06-03 14:44:06 +01:00
ddcd3fb806
Fix the 'complete security' screen
...
https://github.com/matrix-org/matrix-react-sdk/pull/4655 removed
the check for cross-signing account data where the cross-signing
labs flag was enabled if you had an existing cross-signing setup.
This also sent the user to the 'complete security' view rather than
the 'E2E Setup' view though, which meant new logins should always
see the E2E setup screen (ie. be prompted to upgrade encryption).
NB. We need to change this check for SSSS keys in account data
(https://github.com/vector-im/riot-web/issues/13894 ) but we should
put this back the way it was in the meantime.
Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/4655
2020-06-03 14:31:34 +01:00
d92f742205
Fix Jitsi wellknown hooks some more
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-03 14:09:45 +01:00
a674131a8c
Fix Jitsi wellknown hooks
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-03 13:58:17 +01:00
Michael Telatynski