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
f3011f00f7
Remove debug
2020-06-04 19:43:35 +01: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
bba6767608
Update displayed min and max
2020-06-04 18:00:22 +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
2ec47ecc74
Use different setting flag print expected values
2020-06-04 17:50:56 +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
2fe56276f2
css for vis
2020-06-04 10:07:41 -06: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
a3fdd643d7
Add hacky math support
2020-06-04 09:57:16 -06:00
f6504d67ba
Use 10px instead
2020-06-04 16:23:28 +01:00
cdf2d70aea
Merge branch 'develop' into travis/room-list/scrolling-resize
2020-06-04 09:19:54 -06:00
83df79aab9
Try variable resizing
2020-06-04 09:19:03 -06: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
30027a6556
Remove debugging
2020-06-03 21:53:58 -06:00
be4f75bca9
Add a 'show more' button to room lists
2020-06-03 21:53:08 -06:00
dbf996439b
Wedge t3chguy's resizer prototype into the sublist
2020-06-03 21:17:51 -06:00
c07b5ebe9a
Initial experiments with resizing of room lists
2020-06-03 21:17:18 -06: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
ed2eca52b2
Don't show FormatBar if composer is empty
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-06-03 18:05:43 -05: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
Travis Ralston