Commit graph

18747 commits

Author SHA1 Message Date
Bruno Windels
291fae6493 update room trust when cross-signing gets en/disabled 2020-04-09 13:43:30 +02:00
Michael Telatynski
120e2201ad
Merge pull request #4367 from matrix-org/t3chguy/app_load2
App load tweaks, i18n and localStorage
2020-04-09 10:16:19 +01:00
Michael Telatynski
cef9dbe254 Analytics.js gets executed during times where localStorage is not ensured to exist
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 21:42:58 +01:00
Travis Ralston
b5aaae1c27 Fix encoding of widget arguments
Fixes https://github.com/vector-im/riot-web/issues/12985

This is done by using a more modern API and de-encoding dollar signs.
2020-04-08 12:58:52 -06:00
Michael Telatynski
4041c030a5 Apply changes from Figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 14:44:34 +01:00
Michael Telatynski
eec28ce38a Update styling and copy to match Figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 13:47:15 +01:00
Damir Jelić
a26a3f5862 Merge branch 'poljar/eventindex-log-improvement' into develop 2020-04-08 14:23:54 +02:00
Weblate
b0d2c3fd98 Merge branch 'origin/develop' into Weblate. 2020-04-08 11:20:01 +00:00
Besnik Bleta
3a05d74ae8 Translated using Weblate (Albanian)
Currently translated at 99.6% (2268 of 2276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-04-08 11:20:01 +00:00
J. Ryan Stinnett
8ffc206358
Merge pull request #4356 from matrix-org/travis/deactivate-sso
Support deactivating your account with SSO
2020-04-08 12:19:53 +01:00
Weblate
a0ecfdd786 Merge branch 'origin/develop' into Weblate. 2020-04-08 10:32:16 +00:00
J. Ryan Stinnett
a5f6a07ed6
Merge pull request #4359 from matrix-org/jryans/backup-key-cache-format
Add debug status for cached backup key format
2020-04-08 11:32:11 +01:00
Michael Telatynski
ada860f163 Add toggle for e2ee when creating private room in x-signing world
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 10:50:22 +01:00
Weblate
0310e5ec93 Merge branch 'origin/develop' into Weblate. 2020-04-08 09:45:42 +00:00
Michael Telatynski
4d7f3ba109
Merge pull request #4361 from matrix-org/t3chguy/fix_composer_placeholder1
Fix composer placeholder not updating
2020-04-08 10:45:35 +01:00
Michael Telatynski
4447370764 Fix composer placeholder not updating
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 10:19:52 +01:00
Damir Jelić
c6fcaf86ff EventIndex: Log if we had all events in a checkpoint but are continuing. 2020-04-08 11:15:13 +02:00
Weblate
23e1e6f27a Merge branch 'origin/develop' into Weblate. 2020-04-08 09:00:45 +00:00
Michael Telatynski
f61c888f0c
Merge pull request #4358 from matrix-org/t3chguy/fix_complete_security
Fix sas verification buttons to match figma
2020-04-08 10:00:39 +01:00
Weblate
f2ddb96c1b Merge branch 'origin/develop' into Weblate. 2020-04-08 08:47:08 +00:00
MamasLT
7553747433 Translated using Weblate (Lithuanian)
Currently translated at 46.3% (1052 of 2273 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
2020-04-08 08:47:08 +00:00
Kévin C
b9d28f09c8 Translated using Weblate (French)
Currently translated at 100.0% (2273 of 2273 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-04-08 08:47:03 +00:00
Jeff Huang
23ccd6de1c Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2273 of 2273 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-04-08 08:47:03 +00:00
Zoe
17f3b92726
Merge pull request #4345 from matrix-org/foldleft/12982-notifications
Don't show fallback text for verification requests
2020-04-08 09:46:56 +01:00
Weblate
aeb3e55a10 Merge branch 'origin/develop' into Weblate. 2020-04-07 21:34:38 +00:00
Travis Ralston
900a05366e Fix share dialog correctly
componentDidMount fires too late for this dialog, so we need to set ourselves up in the constructor.

Fixes https://github.com/vector-im/riot-web/issues/13068
2020-04-07 15:22:38 -06:00
J. Ryan Stinnett
3196c1a031 Update i18n 2020-04-07 19:24:07 +01:00
Weblate
e91f51af3b Merge branch 'origin/develop' into Weblate. 2020-04-07 18:13:44 +00:00
J. Ryan Stinnett
c21dccc397 Add debug status for cached backup key format
Check backup key format to ease tracking such issues

Debug helper for https://github.com/vector-im/riot-web/issues/13057
2020-04-07 19:11:06 +01:00
Michael Telatynski
712e6e8c49 Fix sas verification buttons to match figma and remove useless inDialog prop from EncryptionPanel.js
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-07 19:03:12 +01:00
Travis Ralston
3ab9634249 Pluralize more differently 2020-04-07 11:46:53 -06:00
Travis Ralston
3be197cf86 Use singular copy when only deleting one device 2020-04-07 11:19:56 -06:00
Weblate
b58f197b54 Merge branch 'origin/develop' into Weblate. 2020-04-07 16:10:47 +00:00
Michael Telatynski
24a5d8355f
Merge pull request #4288 from matrix-org/t3chguy/react_stickers
Deem m.sticker events as actionable for reacting
2020-04-07 17:10:42 +01:00
Weblate
f950d3b365 Merge branch 'origin/develop' into Weblate. 2020-04-07 16:08:43 +00:00
David Baker
112e198a54
Merge pull request #4354 from matrix-org/dbkr/dont_block_dialogs_with_spinner
Don't show spinner over encryption setup dialogs
2020-04-07 17:08:38 +01:00
Weblate
927bf21902 Merge branch 'origin/develop' into Weblate. 2020-04-07 16:03:10 +00:00
rkfg
13545abb20 Translated using Weblate (Russian)
Currently translated at 83.4% (1894 of 2271 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-07 16:03:10 +00:00
Travis Ralston
234f3ee772
Merge pull request #4348 from matrix-org/travis/jitsi/wellknown
Support Jitsi information from client .well-known
2020-04-07 10:03:05 -06:00
Weblate
0b1a97fb81 Merge branch 'origin/develop' into Weblate. 2020-04-07 13:46:28 +00:00
Michael Telatynski
5c5c095737
Merge pull request #4350 from matrix-org/t3chguy/default_home
Add new default home page fallback
2020-04-07 14:46:23 +01:00
Michael Telatynski
b5e6f8b8c1 Iterate PR
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-07 13:34:10 +01:00
David Baker
bce22c620f Don't show spinner over encryption setup dialogs
Fixes https://github.com/vector-im/riot-web/issues/13051
2020-04-07 13:08:18 +01:00
Weblate
b5d77d2774 Merge branch 'origin/develop' into Weblate. 2020-04-07 11:48:03 +00:00
J. Ryan Stinnett
b8a57aa6f2
Merge pull request #4351 from matrix-org/jryans/check-more-account-data
Check more account data in toast listener
2020-04-07 12:47:57 +01:00
Weblate
c2eeaee219 Merge branch 'origin/develop' into Weblate. 2020-04-07 11:31:10 +00:00
David Baker
5b263f1905
Merge pull request #4353 from matrix-org/dbkr/start_presence_after_client_init
Don't try to send presence updates until the client is started
2020-04-07 12:31:04 +01:00
David Baker
8d68a4ab52 Don't try to send presence updates until the client is started
Otherwise we can start making API reqiests which can fail which
can trigger things like the soft logout code.

Fixes https://github.com/vector-im/riot-web/issues/12943
2020-04-07 12:07:41 +01:00
Weblate
aea8c3248c Merge branch 'origin/develop' into Weblate. 2020-04-07 10:55:31 +00:00
Slavi Pantaleev
0dd3ded2a9 Translated using Weblate (Bulgarian)
Currently translated at 84.9% (1924 of 2266 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2020-04-07 10:55:31 +00:00
Michael Telatynski
90255be499 Fix copy button on code blocks when there is no code just pre
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-07 11:17:19 +01:00
J. Ryan Stinnett
971c57552b Check more account data in toast listener
Since any change to cross-signing or secret storage account data may affect the
outcome of checks in the toast listener, we need to broaden the account data
listener there to re-run for changes to all such bits of account data.

Fixes https://github.com/vector-im/riot-web/issues/13048
2020-04-07 10:57:10 +01:00
Michael Telatynski
4d002bd24d delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-07 10:51:51 +01:00
Michael Telatynski
faab35738f Add new default home page fallback
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-07 10:48:56 +01:00
Travis Ralston
53f4820e8e Appease the linter 2020-04-06 16:08:43 -06:00
Travis Ralston
2ec7f2290c Support Jitsi information from client .well-known
It can be useful for the homeserver to support a dedicated Jitsi instance instead of requiring that all their users change/update their configs manually.
2020-04-06 16:04:41 -06:00
Travis Ralston
bdeba252ec Support deactivating your account with SSO
Fixes https://github.com/vector-im/riot-web/issues/12940
2020-04-06 15:42:06 -06:00
Weblate
b638f43873 Merge branch 'origin/develop' into Weblate. 2020-04-06 15:51:13 +00:00
J. Ryan Stinnett
a0d54bd43a Clear sessionStorage on sign out
The browser's `sessionStorage` is only used for composer history today, but
still we should also clear this on sign out for those on shared computers, etc.

Fixes https://github.com/vector-im/riot-web/issues/13041
2020-04-06 16:40:53 +01:00
Zoe
959801cf2f Special-case certain msgtypes for notifications 2020-04-06 16:26:04 +01:00
Weblate
6eee8484e8 Merge branch 'origin/develop' into Weblate. 2020-04-06 12:43:38 +00:00
Zoe
0e1341c498
Merge pull request #4341 from matrix-org/foldleft/12843-resend-requests
Re-request room keys after auth
2020-04-06 13:43:32 +01:00
Weblate
b207936ed4 Merge branch 'origin/develop' into Weblate. 2020-04-06 11:05:49 +00:00
Karol Kosek
60e3f55f5a Translated using Weblate (Polish)
Currently translated at 61.3% (1388 of 2266 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2020-04-06 11:05:49 +00:00
MamasLT
2778f1fa51 Translated using Weblate (Lithuanian)
Currently translated at 43.6% (987 of 2266 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
2020-04-06 11:05:46 +00:00
random
faae7d0b1b Translated using Weblate (Italian)
Currently translated at 100.0% (2266 of 2266 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-04-06 11:05:42 +00:00
Melvyn Laïly
39edfc7c05 Translated using Weblate (French)
Currently translated at 100.0% (2266 of 2266 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-04-06 11:05:41 +00:00
Kévin C
340fd6914f Translated using Weblate (French)
Currently translated at 100.0% (2266 of 2266 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-04-06 11:05:41 +00:00
Stanislav Lukeš
da9fbba37d Translated using Weblate (Czech)
Currently translated at 96.4% (2184 of 2266 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2020-04-06 11:05:40 +00:00
Jeff Huang
0b549ddf7f Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2266 of 2266 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-04-06 11:05:38 +00:00
Besnik Bleta
a5856042b1 Translated using Weblate (Albanian)
Currently translated at 99.7% (2259 of 2266 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-04-06 11:05:37 +00:00
Zoe
5ef06357f6 Merge branch 'develop' into foldleft/better-errors 2020-04-06 11:36:46 +01:00
Michael Telatynski
fc74d927c0 import VelocityBounce sync as it is *tiny* (481B)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-04 17:23:19 +01:00
Weblate
334d76bcf9 Merge branch 'origin/develop' into Weblate. 2020-04-03 19:33:47 +00:00
Michael Telatynski
fe401ce4da
Merge branch 'develop' into t3chguy/xsigning/fix_userinfo_e2eicon 2020-04-03 18:38:30 +01:00
Weblate
956d354ce7 Merge branch 'origin/develop' into Weblate. 2020-04-03 16:01:59 +00:00
random
4c46ae1864 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-04-03 16:01:59 +00:00
@a2sc:matrix.org
fd5a7ad74d Translated using Weblate (German)
Currently translated at 76.7% (1731 of 2258 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-03 16:01:58 +00:00
Jonathan
c0dff26235 Translated using Weblate (German)
Currently translated at 76.7% (1731 of 2258 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-03 16:01:58 +00:00
@a2sc:matrix.org
e8848892f2 Translated using Weblate (German)
Currently translated at 76.7% (1731 of 2258 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-03 15:55:20 +00:00
Jonathan
2c29172d70 Translated using Weblate (German)
Currently translated at 76.7% (1731 of 2258 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-03 15:55:19 +00:00
@a2sc:matrix.org
aaad265190 Translated using Weblate (German)
Currently translated at 76.7% (1731 of 2258 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-03 15:55:03 +00:00
Bruno Windels
adead76882 Merge branch 'develop' into bwindels/selfverifux 2020-04-03 17:53:07 +02:00
Bruno Windels
37289bc832 i18n 2020-04-03 17:05:20 +02:00
Bruno Windels
364421b088 adjust self-verification copy in incoming verif req toast 2020-04-03 17:04:58 +02:00
Bruno Windels
cdbd4da0e4 adjust copy for self-verification in verification panel 2020-04-03 17:04:29 +02:00
Bruno Windels
030d594e67 for self-verif, mention which device, not user we're verifying in panel 2020-04-03 17:03:37 +02:00
Weblate
a0805e8a55 Merge branch 'origin/develop' into Weblate. 2020-04-03 12:28:46 +00:00
Bruno Windels
c15fa2ba0c
Merge pull request #4334 from matrix-org/bwindels/qr-reciprocate
QR code reciprocation
2020-04-03 12:28:41 +00:00
Weblate
20c6dc208c Merge branch 'origin/develop' into Weblate. 2020-04-03 11:52:58 +00:00
Bruno Windels
2698751429
Merge pull request #4339 from jungeonkim/develop
Fix Hangul typing does not work properly
2020-04-03 11:52:53 +00:00
JungEon Kim
94236de637 Fix Hangul typing does not work properly
compositionstart event may fire in the meantime because
compositionend event is being processed asynchronously.

Signed-off-by: JungEon Kim <me@jungeon.kim>
2020-04-03 20:43:34 +09:00
Zoe
0102876e40 Re-request room keys after auth 2020-04-03 11:49:08 +01:00
Weblate
c46358c4bb Merge branch 'origin/develop' into Weblate. 2020-04-03 10:27:37 +00:00
Bruno Windels
9407df3da0
Merge pull request #4336 from matrix-org/bwindels/fixverifytoastaftercompletesecurity
Fix: dismiss setup encryption toast if cross-signing is ready
2020-04-03 10:27:32 +00:00
Weblate
257e2e7266 Merge branch 'origin/develop' into Weblate. 2020-04-03 10:07:54 +00:00
Kévin C
4b5e2198fd Translated using Weblate (French)
Currently translated at 100.0% (2256 of 2256 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-04-03 10:07:54 +00:00
J. Ryan Stinnett
cabaf36794
Merge pull request #4340 from matrix-org/jryans/read-marker-groupers
Fix read marker visibility for grouped events
2020-04-03 11:07:46 +01:00
J. Ryan Stinnett
86f39ee0ee Fix read marker visibility for grouped events
The recent "groupers" which extracted out timeline grouping logic forgot to
pass through the last event state for read marker computation. This causes the
read marker to become visible when e.g. returning to room if it was last placed
inside a grouped set of events (currently room creation and membership events).

Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/4059
Related to https://github.com/vector-im/riot-web/issues/12338
2020-04-03 01:14:31 +01:00
Bruno Windels
2ee780caa2 pass isSelf flag to sas component 2020-04-02 18:28:14 +02:00
Bruno Windels
6bb6885578 adjust sas copy to use device -> session 2020-04-02 18:28:01 +02:00
Bruno Windels
cc9c5cabb3 adapt encryption info to self-verification
- hide text when shown in a dialog
 - adapt "waiting for ... to accept" text to self-verif
2020-04-02 17:51:25 +02:00
Bruno Windels
081baa2359 set dialog title for self-verification
use request.isSelfVerification helper
2020-04-02 17:51:06 +02:00
Bruno Windels
009941a6ac Merge branch 'bwindels/qr-reciprocate' into bwindels/selfverifux 2020-04-02 16:57:44 +02:00
Bruno Windels
1baaafe7b9 some comments to explain the mess 2020-04-02 16:44:42 +02:00
Bruno Windels
0307361fa2 more polish for self-verification 2020-04-02 16:42:39 +02:00
Weblate
2f0d409708 Merge branch 'origin/develop' into Weblate. 2020-04-02 14:30:06 +00:00
Nils J. Haugen
63ed6c3dac Translated using Weblate (Norwegian Nynorsk)
Currently translated at 59.6% (1345 of 2256 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
2020-04-02 14:30:06 +00:00
call_xz
2b7bbe7013 Translated using Weblate (Japanese)
Currently translated at 55.1% (1244 of 2256 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2020-04-02 14:30:01 +00:00
Michael Telatynski
1ae370b97e Pull feature_presence_in_room_list out of labs.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-02 15:20:35 +01:00
Michael Telatynski
3612073852 Nuke the icon_person.svg DM Indicator as it causes more confusion than it solves.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-02 15:12:19 +01:00
David Baker
705fd57a4b Fix spurious extra devices on registration
We send a parameter to prevent being immediately logged in after
registration, but we regressed it from snake case to camelcase
during the course of cross-signing dev.

Fixes https://github.com/vector-im/riot-web/issues/12865
2020-04-02 15:09:33 +01:00
Bruno Windels
ee61a3aff6 dismiss setup encryption toast if cross-signing is ready 2020-04-02 16:07:55 +02:00
Bruno Windels
1f65cfb7f6 polish design and disable buttons after click 2020-04-02 13:44:19 +02:00
Bruno Windels
ccf6c9efdc fixup: more i18n 2020-04-02 13:44:19 +02:00
Bruno Windels
a4f448d4ca update i18n 2020-04-02 13:44:19 +02:00
Bruno Windels
119fd2f519 fixup: these are actually on the verifier 2020-04-02 13:44:19 +02:00
Bruno Windels
fd04f248c4 fix proptype typo 2020-04-02 13:44:19 +02:00
Bruno Windels
00b1afe0fa first go at reciprocate UX 2020-04-02 13:44:19 +02:00
Bruno Windels
1353ddaa96 move qr code data generation to js-sdk 2020-04-02 13:41:19 +02:00
Weblate
ed3642f9b2 Merge branch 'origin/develop' into Weblate. 2020-04-02 10:59:59 +00:00
call_xz
a327cf9d60 Translated using Weblate (Japanese)
Currently translated at 55.1% (1244 of 2256 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2020-04-02 10:59:59 +00:00
random
43bfa3127e Translated using Weblate (Italian)
Currently translated at 100.0% (2256 of 2256 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-04-02 10:59:57 +00:00
David Baker
74186740ee Fix the edit messager composer
Broken in https://github.com/matrix-org/matrix-react-sdk/pull/4313
Fixes https://github.com/vector-im/riot-web/issues/13001
2020-04-02 11:30:43 +01:00
Weblate
90b749b02c Merge branch 'origin/develop' into Weblate. 2020-04-02 08:51:07 +00:00
Nils J. Haugen
0f1ebb0107 Translated using Weblate (Norwegian Nynorsk)
Currently translated at 57.0% (1287 of 2256 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
2020-04-02 08:51:07 +00:00
Jeff Huang
87ba5f4c8a Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2256 of 2256 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-04-02 08:51:04 +00:00
Michael Telatynski
6db51cf9aa
Merge pull request #4321 from matrix-org/t3chguy/room_settings_notif_icon
Fix Room Settings Dialog Notifications tab icon
2020-04-02 09:50:57 +01:00
Weblate
1f8bb54a2b Merge branch 'origin/develop' into Weblate. 2020-04-02 00:56:47 +00:00
Nils J. Haugen
d19ef7cddd Translated using Weblate (Norwegian Nynorsk)
Currently translated at 55.4% (1250 of 2256 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
2020-04-02 00:56:47 +00:00
Nils J. Haugen
ec49dccadc Translated using Weblate (Norwegian Nynorsk)
Currently translated at 52.9% (1194 of 2256 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
2020-04-01 23:51:05 +00:00
Nils J. Haugen
9d33d16104 Translated using Weblate (Norwegian Nynorsk)
Currently translated at 52.9% (1194 of 2256 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
2020-04-01 23:51:05 +00:00
J. A. Durieux
4402398d90 Translated using Weblate (Dutch)
Currently translated at 94.1% (2123 of 2256 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2020-04-01 23:50:56 +00:00
Travis Ralston
c5cf04f6d2 More appeasing of the linter 2020-04-01 16:25:59 -06:00
Travis Ralston
8e405dda2e Fix soft crash when editing message
Fixes https://github.com/matrix-org/riot-web-rageshakes/issues/2504
2020-04-01 16:22:42 -06:00
Travis Ralston
31ec984c86 Actually appease the linter 2020-04-01 14:49:39 -06:00
Travis Ralston
5c2841323e Appease the linter by turning it off 2020-04-01 14:45:54 -06:00
Travis Ralston
f2c41a5da7 Silence another console.warn that should have been a log 2020-04-01 14:40:51 -06:00
Travis Ralston
47e5cfecf2 Silence usages of componentWillReceiveProps
For https://github.com/vector-im/riot-web/issues/12877
2020-04-01 14:35:39 -06:00
Travis Ralston
ab6bd4104f Flag componentWillUpdate as UNSAFE in MatrixChat
For https://github.com/vector-im/riot-web/issues/12877
2020-04-01 14:32:35 -06:00
Travis Ralston
0bb8973ee6 Move rendering of PersistedElements into other lifecycle stages
For https://github.com/vector-im/riot-web/issues/12877

Original error:
```
Warning: Render methods should be a pure function of props and state; triggering nested component updates from render is not allowed. If necessary, trigger nested updates in componentDidUpdate.

Check the render method of PersistedElement.
    in PersistedElement (created by AppTile)
    in div (created by AppTile)
    in div (created by AppTile)
    in AppTile (created by AppsDrawer)
    in div (created by AppsDrawer)
    in div (created by AppsDrawer)
    in AppsDrawer (created by AuxPanel)
    in div (created by AutoHideScrollbar)
    in AutoHideScrollbar (created by AuxPanel)
    in AuxPanel (created by RoomView)
    in div (created by RoomView)
    in div (created by MainSplit)
    in MainSplit (created by RoomView)
    in ErrorBoundary (created by RoomView)
    in main (created by RoomView)
    in RoomView (created by LoggedInView)
    in div (created by LoggedInView)
    in DragDropContext (created by LoggedInView)
    in div (created by LoggedInView)
    in LoggedInView (created by MatrixChat)
    in ErrorBoundary (created by MatrixChat)
    in MatrixChat
```
2020-04-01 14:30:57 -06:00
Weblate
65c7ec92a8 Merge branch 'origin/develop' into Weblate. 2020-04-01 20:14:56 +00:00
Travis Ralston
05b58dc81d
Merge pull request #4330 from matrix-org/travis/react-warnings/4-false-positives
Use console.log in place of console.warn for less warnings
2020-04-01 14:14:51 -06:00
Weblate
703c67cceb Merge branch 'origin/develop' into Weblate. 2020-04-01 20:13:45 +00:00
Travis Ralston
9e14e2d77b
Merge pull request #4329 from matrix-org/travis/fix-breadcrumbs
Revert componentDidMount changes on breadcrumbs
2020-04-01 14:13:39 -06:00
Weblate
c742d7b919 Merge branch 'origin/develop' into Weblate. 2020-04-01 20:02:11 +00:00
Hubert Chathi
8680e50dd1
Merge pull request #4309 from matrix-org/uhoreg/check_sssss_passphrase
Use new method for checking secret storage key
2020-04-01 16:02:06 -04:00
Travis Ralston
ba0a9c8439 Use console.log in place of console.warn for less warnings
These aren't react warnings, but they are distracting in the logs.
2020-04-01 13:59:48 -06:00
Travis Ralston
620c2effda
Appease the linter by turning it off 2020-04-01 13:52:49 -06:00
Travis Ralston
e741d0d577 Revert componentDidMount changes on breadcrumbs
Fixes https://github.com/vector-im/riot-web/issues/12990

Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/4313
2020-04-01 13:41:24 -06:00
Weblate
1d000230ee Merge branch 'origin/develop' into Weblate. 2020-04-01 17:32:26 +00:00
Travis Ralston
c0ffa8b59a Fix merge conflict between react warnings and SSO 2020-04-01 11:32:13 -06:00
Weblate
329762d6a2 Merge branch 'origin/develop' into Weblate. 2020-04-01 17:14:31 +00:00
Travis Ralston
07030a9466
Merge branch 'develop' into travis/react-warnings/3-componentCannotDidMount 2020-04-01 11:14:19 -06:00
Weblate
c157f02fef Merge branch 'origin/develop' into Weblate. 2020-04-01 17:13:51 +00:00
Travis Ralston
0fcbe40bec
Merge pull request #4314 from matrix-org/travis/react-warnings/2-code-quality
Fix a number of minor code quality issues
2020-04-01 11:13:46 -06:00
Weblate
1f00ddff43 Merge branch 'origin/develop' into Weblate. 2020-04-01 17:13:09 +00:00
rkfg
72badf3b6a Translated using Weblate (Russian)
Currently translated at 84.0% (1896 of 2256 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 17:13:09 +00:00
Travis Ralston
59a99bbad8
Merge pull request #4313 from matrix-org/travis/react-warnings/1-componentDidMount
Use componentDidMount in place of componentWillMount where possible
2020-04-01 11:13:04 -06:00
Travis Ralston
8f04746e4e Revert to UNSAFE_componentWillMount where componentDidMount will not work 2020-04-01 11:05:49 -06:00
Weblate
7010b5599c Merge branch 'origin/develop' into Weblate. 2020-04-01 16:52:56 +00:00
Damir Jelić
47ee7e6ec2 Merge branch 'poljar/eventindex-initial-full-crawl' into develop 2020-04-01 18:52:35 +02:00
Weblate
df45e0068a Merge branch 'origin/develop' into Weblate. 2020-04-01 16:47:10 +00:00
Michael Telatynski
544bd09667
Merge pull request #4320 from matrix-org/t3chguy/user_info_buttons
Fix UserInfo e2e buttons to match Figma
2020-04-01 17:47:05 +01:00
Weblate
b3b72af879 Merge branch 'origin/develop' into Weblate. 2020-04-01 16:46:46 +00:00
Michael Telatynski
7143c91d16
Merge pull request #4316 from matrix-org/t3chguy/room-tile-auto-scroll
Only auto-scroll to RoomTile when clicking on RoomTile or via shortcuts
2020-04-01 17:46:41 +01:00
Weblate
2a4c173b49 Merge branch 'origin/develop' into Weblate. 2020-04-01 16:27:30 +00:00
rkfg
f295bb6c12 Translated using Weblate (Russian)
Currently translated at 84.5% (1896 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 16:27:30 +00:00
Travis Ralston
094d006928
Merge pull request #4292 from matrix-org/travis/sso-uia
Support SSO for interactive authentication
2020-04-01 10:27:24 -06:00
Michael Telatynski
0d8fd83e4d move aria-label and title so that it doesn't wrap the e2e icon
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 17:16:28 +01:00
Weblate
e5fa41a246 Merge branch 'origin/develop' into Weblate. 2020-04-01 16:02:53 +00:00
call_xz
dabf8f3870 Translated using Weblate (Japanese)
Currently translated at 54.8% (1229 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2020-04-01 16:02:52 +00:00
rkfg
d520af255e Translated using Weblate (Russian)
Currently translated at 84.4% (1893 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 15:59:59 +00:00
Michael Telatynski
8736867dcf fix /invite Slash Command
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 16:53:25 +01:00
call_xz
2ae83526dc Translated using Weblate (Japanese)
Currently translated at 54.8% (1229 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2020-04-01 13:59:42 +00:00
rkfg
66bf5b6fc4 Translated using Weblate (Russian)
Currently translated at 81.6% (1830 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 13:55:28 +00:00
i47320673
3e09c8b32f Translated using Weblate (Russian)
Currently translated at 81.6% (1830 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 13:50:00 +00:00
rkfg
b9d07738b4 Translated using Weblate (Russian)
Currently translated at 81.6% (1830 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 13:50:00 +00:00
i47320673
814adb8d5d Translated using Weblate (Russian)
Currently translated at 81.6% (1830 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 13:46:15 +00:00
rkfg
1f35343d90 Translated using Weblate (Russian)
Currently translated at 81.6% (1830 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 13:46:15 +00:00
i47320673
436126362f Translated using Weblate (Russian)
Currently translated at 81.6% (1830 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 13:45:35 +00:00
rkfg
46aa022942 Translated using Weblate (Russian)
Currently translated at 81.6% (1830 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 13:45:35 +00:00
Weblate
ed7dae20e3 Merge branch 'origin/develop' into Weblate. 2020-04-01 13:44:27 +00:00
rkfg
53987b093e Translated using Weblate (Russian)
Currently translated at 81.6% (1830 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 13:44:27 +00:00
call_xz
6ced71443c Translated using Weblate (Japanese)
Currently translated at 54.6% (1225 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2020-04-01 13:44:27 +00:00
Valex
e1bc7493a7 Translated using Weblate (Russian)
Currently translated at 81.6% (1830 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 13:42:54 +00:00
rkfg
666f4201da Translated using Weblate (Russian)
Currently translated at 81.6% (1830 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 13:42:54 +00:00
David Baker
8aa24f8987 Fix jitsi popout URL
Needs the template variables filled in
2020-04-01 14:42:17 +01:00
Damir Jelić
bec061239a EventIndex: Mark the initial checkpoints for a full crawl.
The logic determining if a batch of events is already in the database
has been reported to be faulty. Since we know that when we add initial
checkpoints they need to go to the start of the timeline we can mark
them to do a full crawl which will skip the test if the events are
already in the database.

This is a quick fix for this and checkpoints that are added after a gap
in the timeline might incorrectly conclude the same resulting in missing
events if there was a gap and the issue is triggered.
2020-04-01 15:17:59 +02:00
Weblate
24938f5323 Merge branch 'origin/develop' into Weblate. 2020-04-01 13:07:58 +00:00
David Baker
ce68b960f4 Use our own jitsi widget for the popout URL
rather than the URL supplied by the widget
2020-04-01 13:58:44 +01:00
Michael Telatynski
6293684218 Fix Room Settings Dialog Notifications tab icon
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 12:57:28 +01:00
Michael Telatynski
4a4a13ac75 Fix UserInfo e2e buttons to match Figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 12:21:18 +01:00
Weblate
b156dabe63 Merge branch 'origin/develop' into Weblate. 2020-04-01 10:57:34 +00:00
rkfg
91365a1e1a Translated using Weblate (Russian)
Currently translated at 81.6% (1830 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 10:57:34 +00:00
Imre Kristoffer Eilertsen
7792cb8b9b Translated using Weblate (Norwegian Bokmål)
Currently translated at 47.3% (1062 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nb_NO/
2020-04-01 10:57:30 +00:00
David Baker
a76b089cf3
Merge pull request #4319 from matrix-org/dbkr/jitsi_fix_popout
Fix popout support for jitsi widgets
2020-04-01 11:57:25 +01:00
David Baker
072d9f12c7 Remove unintentional changes 2020-04-01 11:41:32 +01:00
David Baker
9b4ce02eaf lint 2020-04-01 11:28:02 +01:00
i47320673
4d2efe2138 Translated using Weblate (Russian)
Currently translated at 79.3% (1779 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 10:21:37 +00:00
rkfg
e5bfa8a85b Translated using Weblate (Russian)
Currently translated at 79.3% (1779 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 10:21:37 +00:00
progserega
f47f7a3ac1 Translated using Weblate (Russian)
Currently translated at 79.3% (1779 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 10:18:51 +00:00
David Baker
a2f92e93a7 Use URL without wurl params for popout
The popout can't be assumed to have the widget API available, so
just leave these params out.
2020-04-01 11:18:45 +01:00
progserega
6f82149824 Translated using Weblate (Russian)
Currently translated at 79.3% (1779 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 10:17:42 +00:00
Vladimir Hodakov
322b36771f Translated using Weblate (Russian)
Currently translated at 79.3% (1779 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 10:17:42 +00:00
rkfg
07d817e8e0 Translated using Weblate (Russian)
Currently translated at 79.3% (1779 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 10:17:42 +00:00
Alexey Murz Korepov
d565c209c8 Translated using Weblate (Russian)
Currently translated at 79.3% (1779 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 10:14:22 +00:00
Weblate
f79ac03ed9 Merge branch 'origin/develop' into Weblate. 2020-04-01 10:03:58 +00:00
rkfg
7adc9429b5 Translated using Weblate (Russian)
Currently translated at 79.3% (1779 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 10:03:58 +00:00
Bruno Windels
7a92c90b79
Merge pull request #4318 from matrix-org/bwindels/fixlegacyuserverif
Fix: legacy verify user throwing error
2020-04-01 10:03:53 +00:00
rkfg
6b11ee5661 Translated using Weblate (Russian)
Currently translated at 79.2% (1777 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 09:57:48 +00:00
David Baker
274eb75c38 Remove get-config API
which is no longer necessary now the jitsi wrapper has its own
external-api script
2020-04-01 10:40:03 +01:00
Weblate
5087ff158b Merge branch 'origin/develop' into Weblate. 2020-04-01 09:30:59 +00:00
Imre Kristoffer Eilertsen
1cc2162d47 Translated using Weblate (Norwegian Bokmål)
Currently translated at 47.2% (1059 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nb_NO/
2020-04-01 09:30:58 +00:00
Dvir Berebi
cb176dd235 Translated using Weblate (Hebrew)
Currently translated at 9.3% (209 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/he/
2020-04-01 09:30:45 +00:00
Peter Pan
6727024e46 Translated using Weblate (German)
Currently translated at 77.1% (1731 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-01 09:30:45 +00:00
Kévin C
918309f4da Translated using Weblate (French)
Currently translated at 100.0% (2244 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-04-01 09:30:44 +00:00
Jeff Huang
79b8fd80c9 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2244 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-04-01 09:30:44 +00:00
Osoitz
d30db00cf1 Translated using Weblate (Basque)
Currently translated at 100.0% (2244 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2020-04-01 09:30:44 +00:00
Bruno Windels
6dc7bf4bdf fix legacy verify user 2020-04-01 11:22:22 +02:00
Michael Telatynski
6bb6dbc0ff Fix Ctrl+/ for Finnish keyboard where it includes Shift
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 10:14:15 +01:00
Michael Telatynski
8bc54ae205 Only auto-scroll to RoomTile when clicking on RoomTile or via shortcuts
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 10:08:26 +01:00
David Baker
538147f7fa Better support for widgets overriding their URLs
Move the URL processing into AppTile so that the widget can have a
URL used for embedding in the page and a separate one for popping
out into a browser.
2020-04-01 10:00:33 +01:00
Travis Ralston
6d0d77f98e Disable the linter on lines it complaints about UNSAFE_componentWillMount 2020-03-31 14:21:12 -06:00
Travis Ralston
0a6f54da33 Label and use UNSAFE_componentWillMount to minimize warnings
These TODO comments are expected to be fixed ASAP, but until that happens let's minimize the errors in the console for development.

For https://github.com/vector-im/riot-web/issues/12877

These all aren't using componentDidMount because they do something which causes application instability if componentDidMount were used. Much of these calls are expected to move into constructors once they are converted to real classes.
2020-03-31 14:15:23 -06:00
Travis Ralston
3f99332f4b Use componentDidMount in place of componentWillMount where possible
This fixes a common React warning we see. Most of these components should be using constructors instead, however componentDidMount is just as good (and doesn't require converting most of these).

Conversion to classes will be done in a later stage of React warning fixes.

For https://github.com/vector-im/riot-web/issues/12877
2020-03-31 14:14:17 -06:00
Travis Ralston
c86d75693b Fix a number of minor code quality issues
Most of these are complaints from my IDE. Discovered by going through nearly every file looking for React warnings.
2020-03-31 14:05:56 -06:00
Märt Põder
a0e5169b59 Added translation using Weblate (Estonian) 2020-03-31 19:48:13 +00:00
Weblate
9b8d4ebdbb Merge branch 'origin/develop' into Weblate. 2020-03-31 16:04:37 +00:00
Michael Telatynski
56dda3895c
Merge pull request #4302 from matrix-org/t3chguy/cmds
rework SlashCommands to better expose aliases
2020-03-31 17:04:31 +01:00
Travis Ralston
64c11c3565 Move ssoUrl to a class property 2020-03-31 09:26:17 -06:00
Michael Telatynski
eb901441cd Fix alignment of e2e icon in userinfo and expose full displayname in title
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-31 16:14:18 +01:00
random
dcd75a801e Translated using Weblate (Italian)
Currently translated at 100.0% (2244 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-03-31 15:00:16 +00:00
Hubert Chathi
6596b7223a Merge branch 'develop' into uhoreg/check_sssss_passphrase 2020-03-31 10:39:56 -04:00
Travis Ralston
4a9bc5e5bf
Update src/components/views/auth/InteractiveAuthEntryComponents.js
Co-Authored-By: David Baker <dbkr@users.noreply.github.com>
2020-03-31 08:29:42 -06:00
Weblate
77f636c74b Merge branch 'origin/develop' into Weblate. 2020-03-31 13:21:48 +00:00
Michael Telatynski
9ed08e76f8
Merge pull request #4310 from matrix-org/t3chguy/fix_peeking
Fix peeking keeping two timeline update mechanisms in play
2020-03-31 14:21:42 +01:00
Michael Telatynski
2624017ab9 Also stop peeking on unmount
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-31 12:51:03 +01:00
Michael Telatynski
80479195c8 iterate PR based on feedback. Remove newballsplease cmd alias
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-31 11:53:26 +01:00
Michael Telatynski
6e61761012 Merge branches 'develop' and 't3chguy/cmds' of github.com:matrix-org/matrix-react-sdk into t3chguy/cmds
 Conflicts:
	src/SlashCommands.tsx
2020-03-31 11:49:53 +01:00
Weblate
77e6cb7c6e Merge branch 'origin/develop' into Weblate. 2020-03-31 10:05:04 +00:00
J. Ryan Stinnett
223a4e285d
Merge pull request #4308 from matrix-org/jryans/4s-prompt-overload
Pass new secret storage key to bootstrap path
2020-03-31 11:04:58 +01:00
J. Ryan Stinnett
24c09cc4c8 Convert secret storage key creation to object 2020-03-31 10:45:53 +01:00
Michael Telatynski
a2a9dc6cd0 Fix peeking keeping two timeline update mechanisms in play
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-31 10:37:56 +01:00
Weblate
8340ac35cd Merge branch 'origin/develop' into Weblate. 2020-03-31 09:07:33 +00:00
J. Ryan Stinnett
2455c5a850
Merge pull request #4303 from matrix-org/jryans/id-change-red
Show red shield for users that become unverified
2020-03-31 10:07:28 +01:00
Weblate
2d8b0ccb80 Merge branch 'origin/develop' into Weblate. 2020-03-31 08:41:27 +00:00
Jeff Huang
b44c83aad7 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2243 of 2243 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-03-31 08:41:27 +00:00
Michael Telatynski
c094afbbe6
Merge pull request #4295 from matrix-org/t3chguy/a11y2
Accessibility fixed for Event List Summary and Composer Format Bar
2020-03-31 09:41:20 +01:00
Michael Telatynski
1c5b7bf132
Merge pull request #4279 from matrix-org/t3chguy/instant_sso
Support $riot: Templates for SSO/CAS urls in the welcome.html page
2020-03-31 09:39:40 +01:00