Commit graph

22403 commits

Author SHA1 Message Date
J. Ryan Stinnett
769f1f4e00
Merge pull request #4185 from matrix-org/jryans/sharing-names
Fix secret sharing names to match spec
2020-03-09 13:48:11 +00:00
J. Ryan Stinnett
47b1552ccc Fix secret sharing names to match spec
When sharing keys, we should use `m.cross_signing` prefix.

Part of https://github.com/vector-im/riot-web/issues/12661
2020-03-09 13:36:02 +00:00
Weblate
5beeb4805c Merge branch 'origin/develop' into Weblate. 2020-03-09 09:55:44 +00:00
Zoe
49fe1887df
Merge pull request #4172 from matrix-org/foldleft/secret-requests
Share secrets with another device on request
2020-03-09 09:55:38 +00:00
Weblate
81bbc1f5bf Merge branch 'origin/develop' into Weblate. 2020-03-09 08:35:30 +00:00
catborise
0c4aac91a4 Translated using Weblate (Turkish)
Currently translated at 77.0% (1650 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-03-09 08:35:30 +00:00
@a2sc:matrix.org
291e5152e8 Translated using Weblate (German)
Currently translated at 78.2% (1674 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-09 08:35:26 +00:00
Tentarial
0cf5594b97 Translated using Weblate (German)
Currently translated at 78.2% (1674 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-09 08:35:26 +00:00
Kévin C
b6a0921bff Translated using Weblate (French)
Currently translated at 100.0% (2142 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-03-09 08:35:25 +00:00
Nathan Follens
0e7428f44c Translated using Weblate (Dutch)
Currently translated at 100.0% (2142 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2020-03-09 08:35:24 +00:00
Stanislav Lukeš
7cf4b1238d Translated using Weblate (Czech)
Currently translated at 99.9% (2141 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2020-03-09 08:35:24 +00:00
Jeff Huang
84f7dc9660 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2142 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-03-09 08:35:23 +00:00
Bruno Windels
1e95048018
Merge pull request #4181 from matrix-org/bwindels/bringbacklegacyverififnoxsignkeys
Fall back to to_device verification if other user hasn't uploaded cross-signing keys
2020-03-09 08:35:13 +00:00
Aaron Raimist
f9f87defa4 Only show old room name if it exists 2020-03-07 12:36:24 -06:00
@a2sc:matrix.org
212c970d91 Translated using Weblate (German)
Currently translated at 77.5% (1659 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-07 09:43:12 +00:00
Tentarial
f2f8e5e2f6 Translated using Weblate (German)
Currently translated at 77.5% (1659 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-07 09:43:11 +00:00
@a2sc:matrix.org
36de51d034 Translated using Weblate (German)
Currently translated at 77.4% (1657 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-07 09:41:31 +00:00
Tentarial
47d73e3a64 Translated using Weblate (German)
Currently translated at 77.4% (1657 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-07 09:41:31 +00:00
@a2sc:matrix.org
356120f0da Translated using Weblate (German)
Currently translated at 77.3% (1656 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-07 09:41:16 +00:00
natowi
dd0d98b997 Translated using Weblate (German)
Currently translated at 77.3% (1656 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-07 09:41:15 +00:00
Krombel
69bfabdcf8 Translated using Weblate (German)
Currently translated at 77.3% (1656 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-07 09:41:15 +00:00
Bamstam
c0abae2928 Translated using Weblate (German)
Currently translated at 77.3% (1656 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-07 09:41:14 +00:00
Tentarial
832f904cdb Translated using Weblate (German)
Currently translated at 77.3% (1656 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-07 09:41:14 +00:00
Aaron Raimist
7850c506b7
When room name is changed, show both the old and new name
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-03-06 22:21:38 -06:00
Travis Ralston
661508ddf8 Order theme names in the dropdown 2020-03-06 17:52:16 -07:00
Travis Ralston
6aeca7b853 UX polish for custom themes 2020-03-06 17:43:10 -07:00
Travis Ralston
65d7bb2ef9 Merge branch 'develop' into travis/poc/theme-command 2020-03-06 17:33:22 -07:00
Weblate
584fb4e905 Merge branch 'origin/develop' into Weblate. 2020-03-06 21:35:07 +00:00
MamasLT
0be4a15bb2 Translated using Weblate (Lithuanian)
Currently translated at 43.5% (932 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
2020-03-06 21:35:07 +00:00
Szimszon
b138f1921f Translated using Weblate (Hungarian)
Currently translated at 100.0% (2142 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-03-06 21:35:05 +00:00
Osoitz
7a640522fe Translated using Weblate (Basque)
Currently translated at 100.0% (2142 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2020-03-06 21:35:05 +00:00
Travis Ralston
1530c91772
Merge pull request #4182 from matrix-org/travis/edit-redactions
Disable edits on redacted events
2020-03-06 14:34:57 -07:00
Travis Ralston
e4d323d2f2 Disable edits on redacted events
Fixes https://github.com/vector-im/riot-web/issues/12633
2020-03-06 14:23:20 -07:00
Weblate
c8b815d27f Merge branch 'origin/develop' into Weblate. 2020-03-06 16:47:24 +00:00
Besnik Bleta
a8a499ce7d Translated using Weblate (Albanian)
Currently translated at 99.7% (2135 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-03-06 16:47:23 +00:00
Bruno Windels
4fd1d8a5e7
Merge pull request #4180 from matrix-org/bwindels/toastwithoutxsign
Use crypto.verification.request even when xsign is disabled
2020-03-06 16:47:17 +00:00
Bruno Windels
b312e73510 Merge branch 'bwindels/toastwithoutxsign' into bwindels/bringbacklegacyverififnoxsignkeys 2020-03-06 17:44:23 +01:00
Bruno Windels
1f9bd55f3b revert to legacy user verification (over to_device) without xsign keys 2020-03-06 17:37:01 +01:00
Bruno Windels
b0617f10e8 stick to IncomingSasDialog as VerificationRequestDialog doesn't show sender yet, makes e2e tests fail 2020-03-06 17:22:56 +01:00
Bruno Windels
f8ef5bb6a5 check .started first as it can be both .started and pending 2020-03-06 17:20:08 +01:00
Bruno Windels
a7de575316 use crypto.verification.request even when xsign is disabled 2020-03-06 16:50:39 +01:00
Weblate
e435f46993 Merge branch 'origin/develop' into Weblate. 2020-03-06 15:28:37 +00:00
Kévin C
778251680d Translated using Weblate (French)
Currently translated at 100.0% (2142 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-03-06 15:28:37 +00:00
Nathan Follens
38ee5c09e4 Translated using Weblate (Dutch)
Currently translated at 99.9% (2141 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2020-03-06 15:28:37 +00:00
Jeff Huang
02d76bdef5 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2142 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-03-06 15:28:36 +00:00
Damir Jelić
69389823f7 ManageEventIndexDialog: Reword and move the crawler state around a bit.
This reflects now the latests design on Figma.
2020-03-06 16:07:10 +01:00
Damir Jelić
364899b27d ManageEventIndexDialog: Show how many rooms are done instead being processed. 2020-03-06 15:44:23 +01:00
Damir Jelić
bff3f3e632 Revert "ManageEventIndexDialog: Reword the status for the currently indexing rooms."
This reverts commit 7d6569a0b87c48733dbddec3c2662325977d0234.
2020-03-06 15:44:23 +01:00
Damir Jelić
8fe54e5dca ManageEventIndexDialog: Reword the status for the currently indexing rooms. 2020-03-06 15:44:23 +01:00
Weblate
eeef56c22d Merge branch 'origin/develop' into Weblate. 2020-03-06 00:24:59 +00:00