Commit graph

22762 commits

Author SHA1 Message Date
Travis Ralston
94d23c815a Improve naming of Jitsi conferences
Fixes https://github.com/vector-im/riot-web/issues/12812
2020-03-20 14:19:47 -06:00
David Baker
ba1d245af9 Make SSSS migration toast dismissable 2020-03-20 19:01:26 +00:00
David Baker
252972e159 Dismiss SSSS migration toast once migration done 2020-03-20 18:53:31 +00:00
Weblate
754ee4e80f Merge branch 'origin/develop' into Weblate. 2020-03-20 16:26:32 +00:00
Michael Telatynski
0212e96938
Merge pull request #4244 from matrix-org/t3chguy/shortcuts3
Add shortcut CmdOrCtrl+. to toggle right panel
2020-03-20 16:26:26 +00:00
Michael Telatynski
a56e474203 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts3
 Conflicts:
	src/components/structures/LoggedInView.js
2020-03-20 16:10:27 +00:00
Weblate
7dc2ed9750 Merge branch 'origin/develop' into Weblate. 2020-03-20 16:09:53 +00:00
Michael Telatynski
06cc710fb0
Merge pull request #4241 from matrix-org/t3chguy/shortcuts1
Improve Keyboard Shortcuts. Add alt-arrows & alt-shift-arrows
2020-03-20 16:09:46 +00:00
Michael Telatynski
064b533a4b Merge branches 'develop' and 't3chguy/shortcuts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts3
 Conflicts:
	src/components/structures/RoomView.js
2020-03-20 16:06:07 +00:00
Michael Telatynski
8a0ee2fd34 iterate PR
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-20 16:00:50 +00:00
Michael Telatynski
75c3a10bfa Merge branches 'develop' and 't3chguy/shortcuts1' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts1 2020-03-20 15:57:25 +00:00
Weblate
1e09c08c48 Merge branch 'origin/develop' into Weblate. 2020-03-20 14:55:23 +00:00
Bruno Windels
c9de12ee74
Merge pull request #4240 from matrix-org/bwindels/bringbacklegacyverif
Bring back legacy verification by comparing public device keys
2020-03-20 14:55:17 +00:00
Bruno Windels
39bd1da1d0 update copy 2020-03-20 15:43:05 +01:00
Bruno Windels
1620f2159b add 2020 foundation copyright 2020-03-20 15:36:58 +01:00
Bruno Windels
b97b887305 fix lint 2020-03-20 15:36:58 +01:00
Bruno Windels
073c2c525f Add "legacy verify" button to untrusted session dialog 2020-03-20 15:36:58 +01:00
Bruno Windels
510b71b0e5 extract manual device verification out of device verify dialog
as the plan is to remove the latter
2020-03-20 15:36:58 +01:00
Damir Jelić
3185d6baf5 EventIndex: Add some logging to the file panel populating. 2020-03-20 13:58:29 +01:00
Bruno Windels
301b484371 ask request if method is supported rather than checking ourselves 2020-03-20 13:37:00 +01:00
Weblate
48a88fbb58 Merge branch 'origin/develop' into Weblate. 2020-03-20 10:52:08 +00:00
Weblate
f8f095af82 Merge branch 'origin/develop' into Weblate. 2020-03-20 10:51:22 +00:00
Damir Jelić
519c7f9ef0 Merge branch 'poljar/empty-search-error' into develop 2020-03-20 11:51:20 +01:00
Michael Telatynski
c176d1e070
Merge pull request #4247 from matrix-org/t3chguy/showHiddentEvents_spoof
Break continuation on showHiddenEvents-rendered events
2020-03-20 10:51:17 +00:00
Weblate
b45e05818e Merge branch 'origin/develop' into Weblate. 2020-03-20 10:50:34 +00:00
Michael Telatynski
624f88f0f1
Merge pull request #4246 from matrix-org/t3chguy/rr_margin
Watch for show-RR settings changes, use room-specific and fix margins
2020-03-20 10:50:29 +00:00
Weblate
f4dc88c7f0 Merge branch 'origin/develop' into Weblate. 2020-03-20 10:45:25 +00:00
random
d199468d0c Translated using Weblate (Italian)
Currently translated at 100.0% (2217 of 2217 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-03-20 10:45:25 +00:00
Kévin C
ad367b1f54 Translated using Weblate (French)
Currently translated at 100.0% (2217 of 2217 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-03-20 10:45:21 +00:00
Samu Voutilainen
0db36b92ca Translated using Weblate (Finnish)
Currently translated at 90.7% (2010 of 2217 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2020-03-20 10:45:17 +00:00
Jeff Huang
7031698314 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2217 of 2217 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-03-20 10:45:13 +00:00
Michael Telatynski
791e406129
Merge pull request #4243 from matrix-org/t3chguy/shortcuts2
Register Mac electron specific Cmd+, shortcut to User Settings
2020-03-20 10:45:05 +00:00
Damir Jelić
759f71cb53 Searching: Return an empty result if the search term is an empty string.
This mimics the behaviour we get from synapse as, this fixes
https://github.com/vector-im/riot-web/issues/12715.
2020-03-20 11:38:43 +01:00
Michael Telatynski
7224243e00 Break continuation on showHiddenEvents-rendered events
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-20 09:41:43 +00:00
Michael Telatynski
1c0c3c4695 Watch for show-RR settings changes, use room-specific and fix margins
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-20 09:29:59 +00:00
Michael Telatynski
61a9dd0ee3 delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-20 00:56:41 +00:00
Michael Telatynski
2fcca5d4e4 Handle matrix.to user permalink in-room rather than solo
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-20 00:42:44 +00:00
Michael Telatynski
1c2c2cbc7c delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-20 00:20:55 +00:00
Michael Telatynski
2b40bb905a Add shortcut CmdOrCtrl+. to toggle right panel. Gets rid of forced-update on right panel changes which may not be the ones we care about.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-20 00:18:24 +00:00
Michael Telatynski
de581b2a5a Register Mac electron specific Cmd+, shortcut to User Settings
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-19 23:42:08 +00:00
Michael Telatynski
4da7ce10de delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-19 23:15:05 +00:00
Michael Telatynski
f5d490ee78 Tidy up code
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-19 23:11:28 +00:00
Michael Telatynski
d7ca374991 open room sublist when using alt-arrows to navigate into it, refire scroll event
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-19 22:07:22 +00:00
David Baker
ea62a13e59 Merge remote-tracking branch 'origin/develop' into dbkr/symmetric-ssss-migrate 2020-03-19 21:14:27 +00:00
David Baker
c8691c73ff Allow key backup restore to get the key backup passphrase
And pass this in as the new callback to bootstrap to get the old
key backup passphrase.
2020-03-19 20:42:16 +00:00
David Baker
9bfc19f367 Fix bug where cross-signing keys would be unintentionally reset
Don't pass the boostrap function directly as a an event handler
as that gets used as the force argument.
2020-03-19 20:40:08 +00:00
Michael Telatynski
7d28137cfd Merge branches 'develop' and 't3chguy/shortcuts1' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts1 2020-03-19 19:18:20 +00:00
Michael Telatynski
578b3f2b97 Improve Keyboard Shortcuts. Add alt-arrows & alt-shift-arrows.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-19 19:07:33 +00:00
Weblate
59250e0936 Merge branch 'origin/develop' into Weblate. 2020-03-19 17:52:18 +00:00
Travis Ralston
20d0e8a888
Merge pull request #4234 from matrix-org/travis/wrapped-jitsi
Use a local wrapper for Jitsi calls
2020-03-19 11:52:14 -06:00