Commit graph

18970 commits

Author SHA1 Message Date
Travis Ralston
f54e99c708 Use WidgetType more often to avoid breaking new sticker pickers
Turns out that setUserWidget() wasn't updated to take a real WidgetType, but the code in ScalarMessaging thought it did. This leads to integration managers trying to add sticker widgets with an object `type` rather than a string `type`, which doesn't work.

This updates other code paths which call into the various widget classes to use WidgetType more often. The actual code path for fixing widgets is resolved in WidgetUtils for the setUserWidget function body.
2020-04-21 16:01:10 -06:00
Michael Telatynski
fd10ab840e undo unrelated change
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-21 18:10:47 +01:00
Michael Telatynski
65b3adfbe3 discard propTypes some more
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-21 18:08:01 +01:00
Michael Telatynski
598cf21684 discard propTypes.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-21 18:01:23 +01:00
Bruno Windels
b8dd68dda2 wait until cross-signing keys are fetched to show verify button 2020-04-21 18:36:15 +02:00
Zoe
61c6c8de45 Add a back button to the devtools verifications panel 2020-04-21 16:27:31 +01:00
Weblate
88b923ab33 Merge branch 'origin/develop' into Weblate. 2020-04-21 09:27:27 +00:00
Kévin C
89058f057d Translated using Weblate (French)
Currently translated at 100.0% (2293 of 2293 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-04-21 09:27:26 +00:00
Michael Telatynski
bf891c85e8 Enable esModuleInterop and iterate PR
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-21 10:01:05 +01:00
David Baker
ce65df6a98 Merge remote-tracking branch 'origin/develop' into dbkr/create_secret_storage_handle_load_error 2020-04-21 09:40:44 +01:00
Weblate
53377bba10 Merge branch 'origin/develop' into Weblate. 2020-04-21 06:30:56 +00:00
rkfg
5dd9dd40d8 Translated using Weblate (Russian)
Currently translated at 89.8% (2058 of 2292 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-21 06:30:56 +00:00
Tuomas Hietala
2d6e4fbe72 Translated using Weblate (Finnish)
Currently translated at 91.0% (2086 of 2292 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2020-04-21 06:30:55 +00:00
Jeff Huang
500f96ef96 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2292 of 2292 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-04-21 06:30:53 +00:00
Michael Telatynski
3b245ee678 add more type annotations
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-20 21:05:00 +01:00
Michael Telatynski
8398e83d33 add more type annotations
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-20 20:35:57 +01:00
Michael Telatynski
66d2a67142 deduplicate emojibase loading
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-20 19:17:58 +01:00
Michael Telatynski
5c57b9ab9b delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-20 19:04:55 +01:00
Michael Telatynski
6328a60301 improve member name
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-20 19:02:27 +01:00
Michael Telatynski
fced4ea51e Convert autocomplete stuff to TypeScript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-20 19:00:54 +01:00
David Baker
58c8f2188a Handle load error in create secret storage dialog 2020-04-20 18:10:23 +01:00
Travis Ralston
36f154f2b2
Name Jitsi correctly in args
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2020-04-20 09:35:35 -06:00
Weblate
bf0903eee1 Merge branch 'origin/develop' into Weblate. 2020-04-20 15:31:28 +00:00
Travis Ralston
a55698e943 Merge branch 'travis/moar-jitsi' into travis/addwidget-improvements 2020-04-20 09:22:38 -06:00
Travis Ralston
d8a5ba9b14 Merge branch 'develop' into travis/moar-jitsi 2020-04-20 09:21:48 -06:00
Weblate
3c84b8bc1f Merge branch 'origin/develop' into Weblate. 2020-04-20 14:21:28 +00:00
rkfg
9d9b80e9c1 Translated using Weblate (Russian)
Currently translated at 89.6% (2053 of 2292 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-20 14:21:27 +00:00
David Baker
360be14b0e
Merge pull request #4450 from matrix-org/dbkr/devicelistener_wait_until_synced
Don't recheck DeviceListener until after initial sync is finished
2020-04-20 15:21:22 +01:00
Weblate
5005749d38 Merge branch 'origin/develop' into Weblate. 2020-04-20 13:39:26 +00:00
Szimszon
0070723df6 Translated using Weblate (Hungarian)
Currently translated at 100.0% (2292 of 2292 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-04-20 13:39:26 +00:00
David Baker
30a3600874
Merge pull request #4449 from matrix-org/dbkr/buttonplaceholder_classname
Fix CSS class in ButtonPlaceholder
2020-04-20 14:39:20 +01:00
David Baker
2546e23a3e Don't recheck DeviceListener until after initial sync is finished
Each recheck caused a GET to account data to see if the master key
exists if done before the initial sync, which is unnecessary here.
This just makes it wait until the initial sync is done to recheck.

Fixes https://github.com/vector-im/riot-web/issues/13279
2020-04-20 14:36:15 +01:00
David Baker
50cc44f0c4 Fix CSS class in ButtonPlaceholder 2020-04-20 14:16:34 +01:00
Weblate
7f562e035f Merge branch 'origin/develop' into Weblate. 2020-04-20 12:57:56 +00:00
Michael Telatynski
ccc1f1fe37
Merge pull request #4441 from matrix-org/t3chguy/login-tab
Password Login make sure tab takes user to password field
2020-04-20 13:57:52 +01:00
Weblate
50dacf995e Merge branch 'origin/develop' into Weblate. 2020-04-20 12:51:54 +00:00
Michael Telatynski
62763650d1
Merge pull request #4443 from matrix-org/t3chguy/cmd_rageshake
Add slash command to send a rageshake
2020-04-20 13:51:48 +01:00
Weblate
25ffbce2e7 Merge branch 'origin/develop' into Weblate. 2020-04-20 08:43:14 +00:00
Kévin C
894968ac71 Translated using Weblate (French)
Currently translated at 100.0% (2291 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-04-20 08:43:14 +00:00
Damir Jelić
3781bdc975 EventIndex: Add a missing semicolon. 2020-04-20 10:10:16 +02:00
Damir Jelić
6084c08f34 EventIndex: Filter out events that don't have a propper content value. 2020-04-20 10:05:04 +02:00
Weblate
67e9ba44dd Merge branch 'origin/develop' into Weblate. 2020-04-20 01:14:29 +00:00
rkfg
343319db50 Translated using Weblate (Russian)
Currently translated at 89.6% (2052 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-20 01:14:29 +00:00
Szimszon
3dfab8ad8c Translated using Weblate (Hungarian)
Currently translated at 100.0% (2291 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-04-20 01:14:28 +00:00
Jeff Huang
ea68de4e73 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2291 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-04-20 01:14:26 +00:00
Travis Ralston
972baa881b
Revert "Fix Filepanel scroll position state lost when room is changed" 2020-04-19 19:14:08 -06:00
Michael Telatynski
881848b98b Add modal to confirm that rageshake from cmd was sent
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-19 12:19:31 +01:00
Michael Telatynski
d0410ade5e i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-19 12:11:40 +01:00
Michael Telatynski
170d10a1a6 Add rageshake slash command
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-19 12:09:07 +01:00
Michael Telatynski
3bc5a0a0b2 Convert submit-rageshake to typescript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-19 12:06:56 +01:00
Weblate
8a1f804af5 Merge branch 'origin/develop' into Weblate. 2020-04-19 10:38:07 +00:00
Karol Kosek
86053ba664 Translated using Weblate (Polish)
Currently translated at 68.2% (1562 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2020-04-19 10:38:07 +00:00
Imre Kristoffer Eilertsen
0f846bc1b6 Translated using Weblate (Norwegian Bokmål)
Currently translated at 49.3% (1130 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nb_NO/
2020-04-19 10:38:04 +00:00
Szimszon
60a3943587 Translated using Weblate (Hungarian)
Currently translated at 100.0% (2291 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-04-19 10:38:00 +00:00
Kévin C
62e9c7e092 Translated using Weblate (French)
Currently translated at 100.0% (2291 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-04-19 10:37:57 +00:00
Øjvind Fritjof Arnfred
7a8dee7213 Translated using Weblate (Danish)
Currently translated at 25.1% (575 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/da/
2020-04-19 10:37:57 +00:00
Jeff Huang
6579f25ef1 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2291 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-04-19 10:37:56 +00:00
Michael Telatynski
7fe8894c51 Update seshat copy to remove trailing full stop
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-18 23:16:40 +01:00
Michael Telatynski
b86b42c89f Password Login make sure tab takes user to password field
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-18 16:18:01 +01:00
Weblate
9c7ac8bf88 Merge branch 'origin/develop' into Weblate. 2020-04-17 21:24:57 +00:00
Travis Ralston
9e7b843f5d
Merge pull request #4388 from ThobyV/thobyv/make-filepanel-remember-scroll-position
Fix Filepanel scroll position state lost when room is changed
2020-04-17 15:24:52 -06:00
Travis Ralston
e0d6fa3f51 Rename ref to timelinePanel 2020-04-17 15:15:51 -06:00
Weblate
6a41012496 Merge branch 'origin/develop' into Weblate. 2020-04-17 21:14:17 +00:00
Travis Ralston
d910eb4d57 Merge branch 'develop' into thobyv/make-filepanel-remember-scroll-position 2020-04-17 15:10:12 -06:00
Travis Ralston
e72008d7f1 Fix end-to-end tests for end-to-end encryption verification
Fixes https://github.com/vector-im/riot-web/issues/13226

This isn't the fastest route, but it is a predictable route for the happy path we probably want to test. For example, Alice will already be staring at the DM and could easily accept the verification there, but we probably want to make sure that the toast is present and does the right thing. Similarly, neither of them need to verify that there's green shields everywhere, they should be implied, however an explicit check follows a real user's gaze.
2020-04-17 14:31:33 -06:00
Weblate
bcce88c335 Merge branch 'origin/develop' into Weblate. 2020-04-17 15:47:34 +00:00
Øjvind Fritjof Arnfred
662e697b9d Translated using Weblate (Danish)
Currently translated at 24.2% (554 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/da/
2020-04-17 15:47:34 +00:00
Michael Telatynski
29028844f9
Merge pull request #4435 from matrix-org/t3chguy/typo1
Fix typo
2020-04-17 16:47:27 +01:00
Michael Telatynski
518639e8b1 Fix typo
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-17 16:04:38 +01:00
Weblate
c4af6ed2a4 Merge branch 'origin/develop' into Weblate. 2020-04-17 13:27:24 +00:00
rkfg
a55c4dab6a Translated using Weblate (Russian)
Currently translated at 89.6% (2052 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-17 13:27:24 +00:00
Øjvind Fritjof Arnfred
c1b7d81f00 Translated using Weblate (Danish)
Currently translated at 24.1% (552 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/da/
2020-04-17 13:27:23 +00:00
Zoe
e3d784816d Merge branch 'develop' into foldleft/better-errors 2020-04-17 14:11:05 +01:00
Weblate
575842fe2a Merge branch 'origin/develop' into Weblate. 2020-04-17 12:14:46 +00:00
Michael Telatynski
66de06c7b9
Merge pull request #4381 from matrix-org/t3chguy/rageshake_incompatible_browser
Rageshake: remind user of unsupported browser and send modernizr report
2020-04-17 13:14:40 +01:00
Weblate
4adafa662b Merge branch 'origin/develop' into Weblate. 2020-04-17 12:06:42 +00:00
Karol Kosek
22094f4a78 Translated using Weblate (Polish)
Currently translated at 65.9% (1508 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2020-04-17 12:06:42 +00:00
Michael Telatynski
cd65bdc799 Merge branches 'develop' and 't3chguy/user_online_dot' of github.com:matrix-org/matrix-react-sdk into t3chguy/user_online_dot
 Conflicts:
	src/components/views/rooms/RoomBreadcrumbs.js
	src/components/views/rooms/RoomTile.js
2020-04-17 12:58:54 +01:00
rkfg
249daf3f9a Translated using Weblate (Russian)
Currently translated at 89.7% (2053 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-17 11:43:23 +00:00
Kévin C
304eb18fd6 Translated using Weblate (French)
Currently translated at 100.0% (2289 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-04-17 11:43:22 +00:00
Michael Telatynski
81c7660bf5 Iterate copy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-17 12:25:16 +01:00
Weblate
986d04ac9e Merge branch 'origin/develop' into Weblate. 2020-04-17 04:38:54 +00:00
@a2sc:matrix.org
f2f2f96531 Translated using Weblate (German)
Currently translated at 77.2% (1767 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-17 04:38:54 +00:00
aWeinzierl
e176aa15ad Translated using Weblate (German)
Currently translated at 77.2% (1767 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-17 04:38:54 +00:00
Nadia Holmquist Pedersen
15149cf4e1 Translated using Weblate (Danish)
Currently translated at 23.9% (547 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/da/
2020-04-17 04:38:53 +00:00
Øjvind Fritjof Arnfred
df3eef1f70 Translated using Weblate (Danish)
Currently translated at 23.9% (547 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/da/
2020-04-17 04:38:53 +00:00
Jeff Huang
7a4442c52b Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2289 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-04-17 04:38:50 +00:00
@a2sc:matrix.org
5bcf383767 Translated using Weblate (German)
Currently translated at 76.9% (1761 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-17 00:56:10 +00:00
Tentarial
1f69a86286 Translated using Weblate (German)
Currently translated at 76.9% (1761 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-17 00:56:10 +00:00
aWeinzierl
b43947650d Translated using Weblate (German)
Currently translated at 76.9% (1761 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-17 00:56:09 +00:00
@a2sc:matrix.org
83ae60dd32 Translated using Weblate (German)
Currently translated at 76.8% (1757 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-17 00:53:52 +00:00
aWeinzierl
11f5554af5 Translated using Weblate (German)
Currently translated at 76.8% (1757 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-17 00:53:52 +00:00
@a2sc:matrix.org
49d92b873f Translated using Weblate (German)
Currently translated at 76.4% (1749 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-17 00:43:42 +00:00
aWeinzierl
e97138fdac Translated using Weblate (German)
Currently translated at 76.4% (1749 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-17 00:43:42 +00:00
Joshua Dietz
b56a80caf5 Translated using Weblate (German)
Currently translated at 76.4% (1748 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-17 00:41:04 +00:00
Tentarial
6fd5047784 Translated using Weblate (German)
Currently translated at 76.4% (1748 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-17 00:41:04 +00:00
@a2sc:matrix.org
23b8dbe862 Translated using Weblate (German)
Currently translated at 76.4% (1748 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-17 00:41:03 +00:00
aWeinzierl
d68853ae7a Translated using Weblate (German)
Currently translated at 76.4% (1748 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-17 00:41:03 +00:00
@a2sc:matrix.org
0900cf1ebe Translated using Weblate (German)
Currently translated at 76.0% (1739 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-17 00:34:35 +00:00
aWeinzierl
792abac523 Translated using Weblate (German)
Currently translated at 76.0% (1739 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-17 00:34:34 +00:00
@a2sc:matrix.org
d880811780 Translated using Weblate (German)
Currently translated at 75.9% (1738 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-17 00:34:06 +00:00
alexsal86
efbac83bc3 Translated using Weblate (German)
Currently translated at 75.9% (1738 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-17 00:34:05 +00:00
aWeinzierl
0489f10cf5 Translated using Weblate (German)
Currently translated at 75.9% (1738 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-17 00:34:05 +00:00
alexsal86
686dc2d7ac Translated using Weblate (German)
Currently translated at 75.4% (1726 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-17 00:24:23 +00:00
aWeinzierl
bf63fd2b50 Translated using Weblate (German)
Currently translated at 75.4% (1726 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-17 00:24:23 +00:00
Travis Ralston
a5f5f759cb Create unencrypted rooms by default in e2e-tests
Otherwise the lazy loading test will try to join the room after the encrypted messages have already been sent, making them invisible. 

See https://github.com/vector-im/riot-web/issues/13226#issuecomment-614928362
2020-04-16 16:27:43 -06:00
Weblate
2863d45f4c Merge branch 'origin/develop' into Weblate. 2020-04-16 20:14:45 +00:00
Szimszon
a81f3f6d19 Translated using Weblate (Hungarian)
Currently translated at 98.3% (2251 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-04-16 20:14:44 +00:00
Øjvind Fritjof Arnfred
cb5b5fddbe Translated using Weblate (Danish)
Currently translated at 22.6% (517 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/da/
2020-04-16 20:14:44 +00:00
David Baker
9e18dbc0dc Fix key backup debug panel
The type changed so it thought it was not stored when it was
2020-04-16 21:08:14 +01:00
Weblate
72e8281bd8 Merge branch 'origin/develop' into Weblate. 2020-04-16 18:51:43 +00:00
Travis Ralston
25fa675f88 Blind attempt at fixing the end to end tests 2020-04-16 11:46:29 -06:00
Travis Ralston
0fcaaab1d0 Appease the linter 2020-04-16 11:18:54 -06:00
Travis Ralston
54f8ba4d80 Remove UI to change the cross-signing setting 2020-04-16 11:15:12 -06:00
Travis Ralston
b5130ca5dc Clean up setting definition to follow surrounding practices
It's not perfect, but we're at least okay with it.
2020-04-16 11:12:47 -06:00
Travis Ralston
db749519e7 Merge branch 'develop' into travis/cross-sign-setting 2020-04-16 11:06:26 -06:00
Weblate
054098bb81 Merge branch 'origin/develop' into Weblate. 2020-04-16 16:26:09 +00:00
Besnik Bleta
65f1f7cfad Translated using Weblate (Albanian)
Currently translated at 99.7% (2282 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-04-16 16:26:09 +00:00
Michael Telatynski
aa5573694e
Merge pull request #4428 from matrix-org/t3chguy/kegan_1
Make RoomPublishSetting import-skinnable
2020-04-16 17:26:01 +01:00
Michael Telatynski
e1e65a0fe1 Make RoomPublishSetting import-skinnable
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 17:13:33 +01:00
Weblate
7127cdb27d Merge branch 'origin/develop' into Weblate. 2020-04-16 14:31:42 +00:00
rkfg
765205869a Translated using Weblate (Russian)
Currently translated at 90.1% (2065 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-16 14:31:42 +00:00
random
9de8adc7af Translated using Weblate (Italian)
Currently translated at 100.0% (2291 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-04-16 14:31:42 +00:00
J. Ryan Stinnett
94ace258f3
Merge pull request #4425 from matrix-org/t3chguy/recovery_copy
Iterate cross-signing copy
2020-04-16 15:31:35 +01:00
Michael Telatynski
aea7ede7d0 update PHASE_PASSPHRASE copy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 14:55:43 +01:00
Michael Telatynski
e942a35525 Fixxy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 14:09:41 +01:00
Michael Telatynski
af59c1b5b3 iterate copy some more
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 14:02:32 +01:00
Michael Telatynski
8c8509a603 i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 13:48:52 +01:00
Michael Telatynski
9ec8fda1ce update Create SSSS Dialog copy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 13:34:18 +01:00
Michael Telatynski
ce78e3b8d8 further tweaks by Matthew
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 13:28:12 +01:00
Michael Telatynski
1fb0f39c84 Replace Verify this session and Complete security
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 13:23:01 +01:00
Michael Telatynski
f65c31383d Copy tweaks with Nad
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 12:52:35 +01:00
Weblate
a3d149d180 Merge branch 'origin/develop' into Weblate. 2020-04-16 11:34:07 +00:00
Michael Telatynski
a9a2999ccc Use recovery passphrase and recovery key everywhere
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 12:26:12 +01:00
Bruno Windels
3933c4c31c ensure twemoji font is loaded when showing SAS emojis 2020-04-16 11:35:54 +02:00
Weblate
a383188b7e Merge branch 'origin/develop' into Weblate. 2020-04-16 09:26:11 +00:00
Bruno Windels
33391a3110
Revert "Fix: load Twemoji before login so complete security gets the right emojis during SAS" 2020-04-16 09:25:18 +00:00
Weblate
7c4bcb1df3 Merge branch 'origin/develop' into Weblate. 2020-04-16 09:15:29 +00:00
Bruno Windels
c396950ca4
Merge pull request #4419 from matrix-org/bwindels/loadtwemojiearlier
Fix: load Twemoji before login so complete security gets the right emojis during SAS
2020-04-16 09:15:24 +00:00
Weblate
54bb76457f Merge branch 'origin/develop' into Weblate. 2020-04-16 08:47:30 +00:00
Michael Telatynski
135cecbd4f
Merge pull request #4410 from matrix-org/t3chguy/copy
consolidate and fix copy to clipboard
2020-04-16 09:47:24 +01:00
Kévin C
bc48d012b8 Translated using Weblate (French)
Currently translated at 100.0% (2291 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-04-16 08:45:02 +00:00
Jeff Huang
5956e9ec6b Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2291 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-04-16 08:45:02 +00:00
Bruno Windels
15075e4c10 load twemoji in matrixclient rather than loggedinview 2020-04-16 10:40:09 +02:00
Travis Ralston
b4e2daaf46 Convert cross-signing feature flag to setting
This is intended as a temporary measure until we're comfortable with removing the flag entirely.
2020-04-15 13:18:42 -06:00
Michael Telatynski
a37ecbbb34
update console.error 2020-04-15 19:24:33 +01:00
Weblate
38762f19ea Merge branch 'origin/develop' into Weblate. 2020-04-15 18:23:34 +00:00
Michael Telatynski
2929bcf998
Merge pull request #4411 from matrix-org/t3chguy/backslash
Fix pills being broken by unescaped characters
2020-04-15 19:23:28 +01:00
Weblate
554d2ee54e Merge branch 'origin/develop' into Weblate. 2020-04-15 17:46:27 +00:00
J. Ryan Stinnett
4154acc9dd
Merge pull request #4415 from matrix-org/t3chguy/wait4initialsync
null-guard MatrixClientPeg in RoomViewStore
2020-04-15 18:46:23 +01:00
Weblate
5cf187e1cb Merge branch 'origin/develop' into Weblate. 2020-04-15 16:50:44 +00:00
Bruno Windels
09e247b4f8
Merge pull request #4414 from matrix-org/bwindels/fixindexernotifs
Fix: prevent spurious notifications from indexer
2020-04-15 16:50:38 +00:00
Michael Telatynski
49e1e6e59f null-guard MatrixClientPeg in RoomViewStore
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 17:31:45 +01:00
Bruno Windels
8c2c777e2b disable reemitting on the client for events mapped from the indexer 2020-04-15 17:37:32 +02:00
Weblate
74bcb95505 Merge branch 'origin/develop' into Weblate. 2020-04-15 15:17:22 +00:00
Valex
6d60784122 Translated using Weblate (Russian)
Currently translated at 90.3% (2065 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-15 15:17:21 +00:00
Michael Telatynski
f4c4fe7d12
Merge pull request #4413 from matrix-org/t3chguy/wait4initialsync
Login block on initialSync with spinners
2020-04-15 16:17:13 +01:00
Michael Telatynski
81f501e844 disable language dropdown too
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 14:19:47 +01:00
Weblate
2ff0521f24 Merge branch 'origin/develop' into Weblate. 2020-04-15 13:08:39 +00:00
Michael Telatynski
7efbae0470
Merge pull request #4408 from matrix-org/t3chguy/fix_network_dropdown_scrolling
Allow network dropdown to be scrollable and fix context menu padding calc
2020-04-15 14:08:34 +01:00
Michael Telatynski
ac26719b69 disable password reset button when spinning
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 14:07:37 +01:00
Weblate
b7caf93cd5 Merge branch 'origin/develop' into Weblate. 2020-04-15 13:07:30 +00:00
random
357dc504f5 Translated using Weblate (Italian)
Currently translated at 100.0% (2288 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-04-15 13:07:29 +00:00
Kévin C
ebef7a2167 Translated using Weblate (French)
Currently translated at 100.0% (2288 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-04-15 13:07:29 +00:00
Jeff Huang
08d56e55d4 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2288 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-04-15 13:07:28 +00:00
J. Ryan Stinnett
fafe57624c
Merge pull request #4412 from matrix-org/jryans/hide-e2e-info-opt
Remove end-to-end message info option when cross-signing is used
2020-04-15 14:07:22 +01:00
Michael Telatynski
8b25223026 fix onLoggedIn getting called twice
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 13:45:12 +01:00
Michael Telatynski
76ce4081cb i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 12:31:27 +01:00
Michael Telatynski
346b2e8588 Login block on initialSync with spinners
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 12:21:49 +01:00
J. Ryan Stinnett
e9c755e73f Remove end-to-end message info option when cross-signing is used
This end-to-end info dialog repeats info available elsewhere and has not been
updated to make sense for cross-signing, triggers old verification methods, etc.
For now, this hides the option to present a more consistent UI.

Relates to https://github.com/vector-im/riot-web/issues/11752
2020-04-15 10:25:05 +01:00
Michael Telatynski
9c1939b756 match all, not just first instance of tokens to escape
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 02:31:30 +01:00
Michael Telatynski
4454db30d6 Escape opening square bracket too
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 01:02:08 +01:00
Michael Telatynski
cb10640eaf detslint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 00:53:35 +01:00
Michael Telatynski
c72139fc3f Convert serialize and deserialize to TypeScript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 00:49:08 +01:00
Michael Telatynski
95eaf94cd8 Fix pills being broken by unescaped characters
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 00:40:38 +01:00
Michael Telatynski
276b5b874c Convert ShareDialog to Typescript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 00:22:19 +01:00
Michael Telatynski
89bc3bdd5b consolidate and extract copyPlaintext, copyNode and selectText
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 00:16:11 +01:00
Travis Ralston
77bdde4021 Merge branch 'travis/moar-jitsi' into travis/addwidget-improvements 2020-04-14 12:58:16 -06:00
Travis Ralston
4fe16b1b84
Merge branch 'develop' into travis/moar-jitsi 2020-04-14 12:57:28 -06:00
Weblate
6e83255b66 Merge branch 'origin/develop' into Weblate. 2020-04-14 18:56:15 +00:00
Travis Ralston
36fea4d487
Merge pull request #4378 from matrix-org/travis/expanding-widgets
Minimize widgets by default
2020-04-14 12:56:10 -06:00
Weblate
d252d7ac6f Merge branch 'origin/develop' into Weblate. 2020-04-14 18:55:54 +00:00
Travis Ralston
f0a2f5dd4f
Merge pull request #4380 from matrix-org/travis/widget-complaints
Add comments to highlight where we'll need m.widget support
2020-04-14 12:55:49 -06:00
Michael Telatynski
769cf1c987 Allow network dropdown to be scrollable and fix context menu window padding calc
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-14 17:34:39 +01:00
Weblate
15c64002c1 Merge branch 'origin/develop' into Weblate. 2020-04-14 16:12:21 +00:00
Bruno Windels
69e680da3c
Merge pull request #4407 from matrix-org/bwindels/checkifxsignisdisabledforlegacyverif
Fix: dont try to enable 4S if cross-signing is disabled
2020-04-14 16:12:16 +00:00
Weblate
5a7b976ff5 Merge branch 'origin/develop' into Weblate. 2020-04-14 15:54:49 +00:00
Bruno Windels
aef6687931
Merge pull request #4406 from matrix-org/bwindels/completesecuritywithoutspinner
Fix: don't confuse user with spinner during complete security step
2020-04-14 15:54:44 +00:00
Bruno Windels
24fe125cb6 dont try to enable 4S if cross-signing is disabled 2020-04-14 17:53:33 +02:00
Weblate
27c4404e23 Merge branch 'origin/develop' into Weblate. 2020-04-14 15:21:55 +00:00
Bruno Windels
861c449055
Merge pull request #4405 from matrix-org/bwindels/qrcodefix
Fix: avoid potential crash during certain verification paths
2020-04-14 15:21:47 +00:00
Bruno Windels
db09cadb66 remove spinner, change copy, add button placeholder 2020-04-14 17:19:15 +02:00
Weblate
b84e7a875f Merge branch 'origin/develop' into Weblate. 2020-04-14 15:03:30 +00:00
Michael Telatynski
7fa38933cb Merge branches 'develop' and 't3chguy/electron-forward-back' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron-forward-back
 Conflicts:
	src/components/structures/LoggedInView.tsx
2020-04-14 15:54:58 +01:00
Bruno Windels
7b3c34bd12 use js-sdk qr code generation 2020-04-14 16:46:02 +02:00
Weblate
3c7eada6d1 Merge branch 'origin/develop' into Weblate. 2020-04-14 14:08:09 +00:00
Michael Telatynski
fc67d1d775
Merge pull request #4398 from matrix-org/t3chguy/liv
Convert LoggedInView to an ES6 PureComponent Class & TypeScript
2020-04-14 15:08:04 +01:00
Michael Telatynski
26569dea06 Revert "@replaceableComponent"
This reverts commit 50d6551c

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-14 14:59:20 +01:00
Michael Telatynski
50d6551c86 @replaceableComponent
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-14 14:50:09 +01:00
Weblate
9f4f145869 Merge branch 'origin/develop' into Weblate. 2020-04-14 13:08:32 +00:00