Jorik Schellekens
ca69a9d7bb
Fix checkbox bleed
2020-06-04 12:03:18 +01:00
Bruno Windels
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
Weblate
e476ac71f8
Merge branch 'origin/develop' into Weblate.
2020-06-04 09:16:51 +00:00
random
9c93e48748
Translated using Weblate (Italian)
...
Currently translated at 100.0% (2258 of 2258 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-06-04 09:16:51 +00:00
Kévin C
db6d60566b
Translated using Weblate (French)
...
Currently translated at 100.0% (2258 of 2258 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-06-04 09:16:51 +00:00
Jeff Huang
39dcc9f23c
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (2258 of 2258 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-06-04 09:16:50 +00:00
Bruno Windels
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
Michael Telatynski
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
Travis Ralston
30027a6556
Remove debugging
2020-06-03 21:53:58 -06:00
Travis Ralston
be4f75bca9
Add a 'show more' button to room lists
2020-06-03 21:53:08 -06:00
Travis Ralston
dbf996439b
Wedge t3chguy's resizer prototype into the sublist
2020-06-03 21:17:51 -06:00
Travis Ralston
c07b5ebe9a
Initial experiments with resizing of room lists
2020-06-03 21:17:18 -06:00
Michael Telatynski
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
Weblate
3f75d82d95
Merge branch 'origin/develop' into Weblate.
2020-06-03 23:36:27 +00:00
Michael Telatynski
bde327e1e6
Merge pull request #4695 from aaronraimist/center-headerbuttons
...
Center HeaderButtons
2020-06-04 00:36:23 +01:00
Aaron Raimist
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
Aaron Raimist
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
Aaron Raimist
711ddd42c9
Remove some unused images
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-06-03 17:23:37 -05:00
Aaron Raimist
3b5de137c4
Center HeaderButtons
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-06-03 17:23:23 -05:00
Michael Telatynski
096045a037
change names of consts for clarity
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-03 22:15:01 +01:00
Michael Telatynski
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
Weblate
bfb1dc2938
Merge branch 'origin/develop' into Weblate.
2020-06-03 21:12:19 +00:00
Michael Telatynski
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
Weblate
21b378c8b0
Merge branch 'origin/develop' into Weblate.
2020-06-03 20:09:11 +00:00
Matthew Hodgson
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
Aaron Raimist
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
Weblate
bfff565eae
Merge branch 'origin/develop' into Weblate.
2020-06-03 19:28:06 +00:00
Michael Telatynski
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
Weblate
3f028725ec
Merge branch 'origin/develop' into Weblate.
2020-06-03 19:23:30 +00:00
Michael Telatynski
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
Michael Telatynski
899f9ede45
change names of consts for clarity
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-03 20:23:01 +01:00
Weblate
9898532b49
Merge branch 'origin/develop' into Weblate.
2020-06-03 19:21:19 +00:00
Travis Ralston
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
Michael Telatynski
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
Travis Ralston
bc2fbefb5c
Remove iteratorToArray
2020-06-03 11:29:06 -06:00
Weblate
abbcc316ed
Merge branch 'origin/develop' into Weblate.
2020-06-03 16:10:11 +00:00
Travis Ralston
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
Weblate
133c873b31
Merge branch 'origin/develop' into Weblate.
2020-06-03 16:09:39 +00:00
Tirifto
520bb1e6fa
Translated using Weblate (Esperanto)
...
Currently translated at 100.0% (2257 of 2257 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2020-06-03 16:09:39 +00:00
Michael Telatynski
3c922329fe
Merge pull request #4672 from matrix-org/matthew/emoji13
...
upgrade to twemoji 13.0.0
2020-06-03 17:09:32 +01:00
Jorik Schellekens
5bc756cba1
Fix checkbox bleed
2020-06-03 16:48:05 +01:00
Michael Telatynski
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
Weblate
9864e5d783
Merge branch 'origin/develop' into Weblate.
2020-06-03 14:37:25 +00:00
Michael Telatynski
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
Weblate
b381b3825b
Merge branch 'origin/develop' into Weblate.
2020-06-03 13:44:13 +00:00
random
003e75968a
Translated using Weblate (Italian)
...
Currently translated at 100.0% (2257 of 2257 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-06-03 13:44:13 +00:00
Priit Jõerüüt
677c7aac45
Translated using Weblate (Estonian)
...
Currently translated at 57.8% (1304 of 2257 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
2020-06-03 13:44:13 +00:00
David Baker
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
David Baker
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
Michael Telatynski
d92f742205
Fix Jitsi wellknown hooks some more
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-03 14:09:45 +01:00