Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-17 22:14:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,539 Commits 206 Branches 552 Tags 519 MiB
3eb07465f7
Commit Graph

17234 Commits

Author SHA1 Message Date
Michael Telatynski
e23a3e98be Only enumerate settings handlers which are supported currently 2020-02-04 15:27:38 +00:00
Zoe
d822104159
Merge pull request #4010 from matrix-org/foldleft/11968-verify-verification 
double-check user verification
 2020-02-04 13:47:32 +00:00
Zoe
150fe7a45a Tests for MKeyVerificationConclusion 2020-02-04 11:25:19 +00:00
Michael Telatynski
f6c7df8c69 Keep date in Watcher IDs 2020-02-04 11:14:49 +00:00
Michael Telatynski
2d8a2c5210 Merge branches 'develop' and 't3chguy/watcher_id' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/watcher_id 2020-02-04 10:47:53 +00:00
Michael Telatynski
a8f7e381eb SettingsStore, use a counter instead of wall clock for watcher ids 2020-02-04 10:41:48 +00:00
Travis Ralston
bf9d5b7f01
Merge pull request #4027 from matrix-org/travis/fix-room-list 
Don't crash immediately if the room directory chunk is null/empty
 2020-02-04 09:36:12 +00:00
Zoe
fab54ab936
Merge pull request #3998 from matrix-org/zip/12038-toast-timeouts 
Fix verification toast to close at 0s
 2020-02-04 09:30:47 +00:00
Zoe
41f4b38fe8 Do not show alarming red shields on large encrypted rooms for your own device 
Fixes: https://github.com/vector-im/riot-web/issues/12214
 2020-02-03 16:53:32 +00:00
Travis Ralston
aa6eabcf57 Don't crash immediately if the room directory chunk is null/empty 
Fixes https://github.com/vector-im/riot-web/issues/12197
 2020-02-03 15:49:18 +00:00
David Baker
11cb3a60b2 Fix listener leak in TagPanel 2020-02-03 13:33:44 +00:00
catborise
fb6bb2fd6b Translated using Weblate (Turkish) 
Currently translated at 70.7% (1486 of 2101 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-02-03 09:43:38 +00:00
random
f0bd75fcfb Translated using Weblate (Italian) 
Currently translated at 94.5% (1986 of 2101 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-02-03 09:43:36 +00:00
Szimszon
c879d4c0ab Translated using Weblate (Hungarian) 
Currently translated at 94.4% (1984 of 2101 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-02-03 09:43:34 +00:00
Kévin C
ee9f3c9e18 Translated using Weblate (French) 
Currently translated at 100.0% (2101 of 2101 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-02-03 09:43:31 +00:00
J. A. Durieux
a71c368994 Translated using Weblate (Dutch) 
Currently translated at 79.3% (1667 of 2101 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-02-03 09:43:31 +00:00
Jeff Huang
a31be025cf Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2101 of 2101 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-02-03 09:43:29 +00:00
Weblate
949eb73c9f Merge branch 'origin/develop' into Weblate. 2020-02-01 12:28:35 +00:00
Osoitz
bc2fa4d31b Translated using Weblate (Basque) 
Currently translated at 97.7% (2053 of 2101 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2020-02-01 12:28:35 +00:00
David Baker
a3ef0aa6e8 Honour the isLogin flag in theme.js 
Horrendous hack to fix the fact that if 'match system theme' was
set, the isLogin flag in the controller would do nothing because
theme.js would have decided to use the system theme before even
asking what the theme setting was.
 2020-02-01 12:09:41 +00:00
Weblate
1db608e713 Merge branch 'origin/develop' into Weblate. 2020-02-01 11:18:54 +00:00
lissitz
e946f5f4b8 Translated using Weblate (Spanish) 
Currently translated at 67.6% (1420 of 2100 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2020-02-01 11:18:54 +00:00
Jeff Huang
455b4f9a40 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2100 of 2100 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-02-01 11:18:53 +00:00
Osoitz
dad44d0b1f Translated using Weblate (Basque) 
Currently translated at 93.5% (1964 of 2100 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2020-02-01 11:18:52 +00:00
Damir Jelić
d8576f23de ManageEventINdexDialog: Fix a line length issue. 2020-02-01 12:11:49 +01:00
Damir Jelić
75fe3c2219 ManageEventIndexDialog: Show how many rooms are being currently crawled. 2020-02-01 12:01:53 +01:00
Weblate
00ca4458f6 Merge branch 'origin/develop' into Weblate. 2020-02-01 00:22:25 +00:00
lissitz
6e33d35e87 Translated using Weblate (Spanish) 
Currently translated at 66.5% (1396 of 2100 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2020-02-01 00:22:25 +00:00
lissitz
8c9af0dec6 Translated using Weblate (Czech) 
Currently translated at 87.8% (1844 of 2100 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2020-02-01 00:22:16 +00:00
Travis Ralston
98c8986ead
Merge pull request #4021 from matrix-org/travis/fix-scan-temp 
Advertise that we can scan QR codes even though we can't
 2020-02-01 00:22:10 +00:00
Weblate
26e41ec97c Merge branch 'origin/develop' into Weblate. 2020-01-31 19:13:21 +00:00
catborise
3f706c0eda Translated using Weblate (Turkish) 
Currently translated at 70.0% (1469 of 2098 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-01-31 19:13:21 +00:00
Damir Jelić
01c1c2364b ManageEventIndexDialog: Add back a control for the crawler sleep time. 2020-01-31 18:46:45 +01:00
Damir Jelić
5eb510387c EventIndex: Don't process checkpoints that don't have a valid token. 
Some rooms might have null as a token, don't add those to be crawled nor
to the index.

Catch any other errors that might occur during the addition of an
initial checkpoint and log them.
 2020-01-31 18:46:45 +01:00
Damir Jelić
0e5fec5feb EventIndex: Catch errors when removing a crawler checkpoint. 2020-01-31 18:46:45 +01:00
Travis Ralston
2b62c6773d Advertise that we can scan QR codes even though we can't 
This is to fix RiotX not realizing it can scan QR codes. Follow up issue is https://github.com/vector-im/riot-web/issues/12178
 2020-01-31 17:10:06 +00:00
Kévin C
aa35fc4273 Translated using Weblate (French) 
Currently translated at 100.0% (2098 of 2098 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-01-31 16:23:56 +00:00
Weblate
7d418e16ff Merge branch 'origin/develop' into Weblate. 2020-01-31 15:13:24 +00:00
J. Ryan Stinnett
2584772bfb
Merge pull request #4017 from matrix-org/jryans/e2e-copy-changes 
Apply copy edits to security setup flow
 2020-01-31 15:13:18 +00:00
Weblate
0c6170fc24 Merge branch 'origin/develop' into Weblate. 2020-01-31 15:12:59 +00:00
Kévin C
fcfac9b6ed Translated using Weblate (French) 
Currently translated at 99.9% (2106 of 2107 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-01-31 15:12:59 +00:00
J. Ryan Stinnett
16f72140b9
Merge pull request #4016 from matrix-org/jryans/verif-status-text 
Fix user trust text to match what was checked
 2020-01-31 15:12:52 +00:00
J. Ryan Stinnett
d5811cad28 Change UI auth title for cross-signing 2020-01-31 15:04:51 +00:00
Kévin C
7234925fa0 Translated using Weblate (French) 
Currently translated at 98.6% (2077 of 2107 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-01-31 14:48:01 +00:00
Jeff Huang
2d61a9d392 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2107 of 2107 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-01-31 14:47:56 +00:00
J. Ryan Stinnett
0fad5a62b4 Fix user trust text to match what was checked 
This fixes the unverified users status text to omit devices since they haven't
been checked.

Fixes https://github.com/vector-im/riot-web/issues/12176
 2020-01-31 14:06:57 +00:00
Weblate
251fed9c52 Merge branch 'origin/develop' into Weblate. 2020-01-31 13:44:18 +00:00
Jeff Huang
dacf900a9f Translated using Weblate (Chinese (Traditional)) 
Currently translated at 99.4% (2093 of 2106 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-01-31 13:44:18 +00:00
J. Ryan Stinnett
11008cfabf
Merge pull request #4013 from matrix-org/jryans/padlock-flag 
Add temporary feature flag to control padlocks
 2020-01-31 13:44:12 +00:00
Weblate
7b95b3a36b Merge branch 'origin/develop' into Weblate. 2020-01-31 13:30:18 +00:00
David Baker
85489c4ec5
Merge pull request #4014 from matrix-org/dbkr/theme_is_login_override 
Add an override for the theme
 2020-01-31 13:30:12 +00:00
Weblate
e3f9de0cf4 Merge branch 'origin/develop' into Weblate. 2020-01-31 13:22:28 +00:00
J. Ryan Stinnett
636b3696ed
Merge pull request #4011 from matrix-org/jryans/comp-sec-title 
Add title to complete security loading
 2020-01-31 13:22:22 +00:00
David Baker
cb9362456f remove setter 2020-01-31 13:18:01 +00:00
David Baker
2d9b111680 Add an override for the theme 
So we can force the light theme on unthemeable pages like the login
& complete security page.

Fixes https://github.com/vector-im/riot-web/issues/12149
Fixes https://github.com/vector-im/riot-web/issues/12157
 2020-01-31 12:28:14 +00:00
J. Ryan Stinnett
02cada7cc6 First pass of copy changes 2020-01-31 12:15:19 +00:00
J. Ryan Stinnett
b64ba1dbbf Add temporary feature flag to control padlocks 
This default on feature flag will help in case we want to trial padlocks on vs.
off this weekend.

Fixes https://github.com/vector-im/riot-web/issues/12166
 2020-01-31 11:09:49 +00:00
Weblate
0447501c3b Merge branch 'origin/develop' into Weblate. 2020-01-31 11:06:01 +00:00
David Baker
630507304a
Merge pull request #4012 from matrix-org/dbkr/just_one_zxcvbn_suggestion 
Only display the first zxcvbn warning/suggestion
 2020-01-31 11:05:54 +00:00
Weblate
9e92d2ab1c Merge branch 'origin/develop' into Weblate. 2020-01-31 11:00:20 +00:00
David Baker
c111d70deb
Merge pull request #4009 from matrix-org/dbkr/log_exceptions_other_than_cancel 
Log exceptions from accessSecretStorage
 2020-01-31 11:00:16 +00:00
David Baker
96d5fb5ce3 Only display the first zxcvbn warning/suggestion 
As per comment

Fixes https://github.com/vector-im/riot-web/issues/12150
 2020-01-31 10:59:35 +00:00
J. Ryan Stinnett
1a95a1d4ba Add title to complete security loading 2020-01-31 10:47:58 +00:00
Weblate
025adb0a6f Merge branch 'origin/develop' into Weblate. 2020-01-31 10:46:02 +00:00
J. Ryan Stinnett
19ab395c18
Merge pull request #3995 from matrix-org/jryans/4s-in-mem 
Add advanced option to keep secret storage in memory for session
 2020-01-31 10:45:57 +00:00
David Baker
ea7f160950 lint 2020-01-31 10:38:20 +00:00
Zoe
af0598bbcb double-check user verification 2020-01-31 10:37:40 +00:00
David Baker
26c9b64c3b Log exceptions from accessSecretStorage 
Rather than ignoring everything assuming the user cancelled
 2020-01-31 10:35:05 +00:00
Weblate
5ab707bd8b Merge branch 'origin/develop' into Weblate. 2020-01-31 10:20:18 +00:00
J. Ryan Stinnett
68b2454920
Merge pull request #4006 from matrix-org/jryans/user-list-deco 
Add shields to member list, move power label to text
 2020-01-31 10:20:13 +00:00
Weblate
e9426680be Merge branch 'origin/develop' into Weblate. 2020-01-31 10:20:10 +00:00
Jeff Huang
fe33e2664f Translated using Weblate (Chinese (Traditional)) 
Currently translated at 99.2% (2086 of 2102 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-01-31 10:20:09 +00:00
David Baker
24075dc248
Merge pull request #4005 from matrix-org/dbkr/encryption_events 
Make encryption events into bubble-style tiles
 2020-01-31 10:20:03 +00:00
Zoe
36d7b8e3ed don't close in UI, a js-sdk event will do that 2020-01-31 09:59:24 +00:00
David Baker
d0ab37ac50 Only say the room is encrypted if it actually is 2020-01-31 09:58:21 +00:00
Weblate
2e65ec2c58 Merge branch 'origin/develop' into Weblate. 2020-01-31 09:58:05 +00:00
Jeff Huang
eb02c60abe Translated using Weblate (Chinese (Traditional)) 
Currently translated at 99.3% (2083 of 2098 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-01-31 09:58:05 +00:00
Zoe
585a38cd45
Merge pull request #4000 from matrix-org/foldleft/12038-copy 
Update copy when the user verifies their own devices
 2020-01-31 09:57:52 +00:00
J. Ryan Stinnett
3ef7e5113b Move power label to right of name 
The power label is shown to the right of the name, but hidden on hover.

Part of https://github.com/vector-im/riot-web/issues/11940
 2020-01-30 22:09:57 +00:00
J. Ryan Stinnett
57c4293fc6 Add verification status icons to room members 
This displays verification status on each room member tile using the same shield
logic as elsewhere.

Part of https://github.com/vector-im/riot-web/issues/11940
 2020-01-30 21:38:40 +00:00
Weblate
246a4406c9 Merge branch 'origin/develop' into Weblate. 2020-01-30 21:16:56 +00:00
Michael Telatynski
b98b0fe478
Merge pull request #4004 from matrix-org/t3chguy/invite 
Use Sets instead of array scans and simplify hiding of invalid users when inviting
 2020-01-30 21:16:51 +00:00
Weblate
813114390f Merge branch 'origin/develop' into Weblate. 2020-01-30 21:16:12 +00:00
Michael Telatynski
7db6f89a9f hmm, there were two things using the client :(( 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-30 21:07:32 +00:00
Michael Telatynski
1e09399dd6 delint and collapse two consecutive filter operations 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-30 21:01:55 +00:00
Michael Telatynski
7e45979e00 change order of if or conditions as micro-optimization 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-30 20:59:30 +00:00
David Baker
58d16fea7d lint 2020-01-30 20:59:27 +00:00
David Baker
d56de6a673 i18n again 2020-01-30 20:52:37 +00:00
David Baker
f84795ebae Remove now unused code from TextForEvent 2020-01-30 20:50:12 +00:00
David Baker
5760e71318 i18n 2020-01-30 20:50:06 +00:00
David Baker
2332cdb5d8
full stop 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-01-30 20:47:46 +00:00
David Baker
5447a04f8e oops, forgot the component 2020-01-30 20:15:15 +00:00
David Baker
39e9bffe1f Make encryption events into bubble-style tiles 
Factors out the verification tile stuff into encryption event
styles so we can reuse them betwen all the encryption event tiles.
Also makes the event list summary stuff even more gnarly by
putting the encryption event tile above the group. We really need
to refactor that. :/

Fixes https://github.com/vector-im/riot-web/issues/12006
 2020-01-30 20:03:26 +00:00
Michael Telatynski
bc71092b81 Use Sets instead of array scans and simplify hiding of invalid users to invite 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-30 19:27:59 +00:00
Michael Telatynski
b84fd245b1 Fix room completion for invited rooms and upgraded rooms 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-30 18:03:45 +00:00
Travis Ralston
724cff6a2e Update QR code rendering to support VerificationRequests 
Makes for building the QR code easier and more common.
 2020-01-30 17:12:44 +00:00
Zoe
e58b59c26e don't tell users to verify themselves in person 2020-01-30 16:41:25 +00:00
J. Ryan Stinnett
bae35c0859 Change power icon to label instead 2020-01-30 16:40:25 +00:00
J. Ryan Stinnett
ceebb7dc55 Remove unused Entities, UserTile modules 2020-01-30 16:40:25 +00:00
Zoe
f787bde80a copy 2020-01-30 16:36:57 +00:00
Weblate
c5306fd7b6 Merge branch 'origin/develop' into Weblate. 2020-01-30 16:30:24 +00:00
David Baker
8a09cfbfbd
Merge pull request #3999 from matrix-org/dbkr/user_info_black_shields 
Make shields in UserInfo black if user isn't verified
 2020-01-30 16:30:19 +00:00
Zoe
a9d85e1fa3 lint 2020-01-30 16:27:35 +00:00
David Baker
4f62fc16bd lint 2020-01-30 16:19:04 +00:00
Weblate
a92b14c7ab Merge branch 'origin/develop' into Weblate. 2020-01-30 16:13:00 +00:00
J. Ryan Stinnett
ddc628c804
Merge pull request #3994 from matrix-org/jryans/verify-user-text 
Change verify user text
 2020-01-30 16:12:55 +00:00
Zoe
4a3ea30e52 copy for verification screen 2020-01-30 16:11:05 +00:00
David Baker
77618d30fd Actually this is green because it's a link 
not because the things were verified. Use the linkButton class
 2020-01-30 16:08:42 +00:00
Zoe
9f5f15d1d3 Update copy when the user verifies their own devices 2020-01-30 15:59:59 +00:00
David Baker
0956d00637 Make shields in UserInfo black if user isn't verified 2020-01-30 15:59:03 +00:00
Zoe
99b04a6f70 lint 2020-01-30 15:41:26 +00:00
Zoe
49d2ed8906 ... and take action when the counter reaches zero in verification toast 2020-01-30 15:37:44 +00:00
Zoe
7e98ea79d2 Fix verification toast timeouts to not stick at 0 
Fixes: https://github.com/vector-im/riot-web/issues/12038
 2020-01-30 15:31:20 +00:00
Weblate
e94af1e643 Merge branch 'origin/develop' into Weblate. 2020-01-30 15:19:38 +00:00
Zoe
318689f40b Disable all inputs in login form while busy, not just the submit button 2020-01-30 15:06:36 +00:00
J. Ryan Stinnett
788cb24093 Add advanced option to keep secret storage in memory for session 
This adds a default-off option to keep the secret storage passphrase cached in
memory for the current session to avoid death by prompts.
 2020-01-30 14:18:12 +00:00
J. Ryan Stinnett
fd5798aa87 Change verify user text 2020-01-30 13:21:51 +00:00
Weblate
e18e01217c Merge branch 'origin/develop' into Weblate. 2020-01-30 13:10:37 +00:00
Zoe
767015d19d
Merge pull request #3993 from matrix-org/foldleft/12106-round-two 
fix SAS dialog width
 2020-01-30 13:10:32 +00:00
Weblate
ae57feaf70 Merge branch 'origin/develop' into Weblate. 2020-01-30 13:08:47 +00:00
J. Ryan Stinnett
9c8ffb6c4e
Merge pull request #3990 from matrix-org/t3chguy/fix_composer_placeholder 
Update placeholder in the composer when it gets changed
 2020-01-30 13:08:42 +00:00
Zoe
4c1cc6feba fix SAS dialog width 
used fixedWidth to accomplish the same goal

clean up css
 2020-01-30 12:48:41 +00:00
Weblate
4de9a2074e Merge branch 'origin/develop' into Weblate. 2020-01-30 11:53:34 +00:00
David Baker
c8673452be Merge remote-tracking branch 'origin/develop' into dbkr/default_display_name_register 2020-01-30 11:45:54 +00:00
David Baker
2f4b3272da Send initial device display najme on register 
Fixes https://github.com/vector-im/riot-web/issues/12140
 2020-01-30 11:27:54 +00:00
Weblate
cbd9c52ad8 Merge branch 'origin/develop' into Weblate. 2020-01-30 11:26:19 +00:00
Travis Ralston
67468d85c6
Merge pull request #3959 from matrix-org/travis/update-qr-code 
Update QR code handling for new spec
 2020-01-30 11:26:13 +00:00
Weblate
68c61a057e Merge branch 'origin/develop' into Weblate. 2020-01-30 11:16:24 +00:00
random
f2dda28ad3 Translated using Weblate (Italian) 
Currently translated at 95.5% (2002 of 2096 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-01-30 11:16:24 +00:00
Jeff Huang
7038481394 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 94.8% (1988 of 2096 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-01-30 11:16:22 +00:00
Michael Telatynski
52ed55d887 Update placeholder when it changes, not sure how this ever worked 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-30 00:23:19 +00:00
Michael Telatynski
ea0fafc4e9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/olympics 2020-01-29 22:55:02 +00:00
Weblate
4de21aa676 Merge branch 'origin/develop' into Weblate. 2020-01-29 22:45:40 +00:00
Michael Telatynski
1475f5c73a
Merge pull request #3988 from matrix-org/t3chguy/fix_Field_usage 
Pass an ID to the <Field/> as needed and fix div inside p nesting
 2020-01-29 22:45:34 +00:00
Michael Telatynski
33ec73095e Apply the Olympic effect to SAS Emoji Verification 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-29 22:44:49 +00:00
Michael Telatynski
a180dddc66 Pass an ID to the <Field/> as needed and fix div inside p nesting 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-29 22:31:19 +00:00
Weblate
6d6813efaa Merge branch 'origin/develop' into Weblate. 2020-01-29 22:22:59 +00:00
J. Ryan Stinnett
c851cc6070
Merge pull request #3987 from matrix-org/jryans/update-user-info-trust 
Update user info for device and trust changes
 2020-01-29 22:22:54 +00:00
J. Ryan Stinnett
eaa48665d2 Guard request input 2020-01-29 21:59:30 +00:00
J. Ryan Stinnett
7a5bf8f102 Update user info for device and trust changes 
This ensure the user info panel updates automatically for device and trust
changes.

Fixes https://github.com/vector-im/riot-web/issues/12134`
 2020-01-29 21:55:29 +00:00
Weblate
7e8392456e Merge branch 'origin/develop' into Weblate. 2020-01-29 20:40:18 +00:00
J. Ryan Stinnett
786ddb8a7e
Merge pull request #3985 from matrix-org/jryans/relax-account-data-check 
Relax secret storage account data check
 2020-01-29 20:40:13 +00:00
Weblate
7c20bb8e78 Merge branch 'origin/develop' into Weblate. 2020-01-29 19:55:38 +00:00
J. Ryan Stinnett
d362cc0f41 Fix room device level send setting 2020-01-29 19:55:27 +00:00
Weblate
b2fe0c5dde Merge branch 'origin/develop' into Weblate. 2020-01-29 19:54:06 +00:00
catborise
d854afdfd4 Translated using Weblate (Turkish) 
Currently translated at 70.4% (1475 of 2095 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-01-29 19:54:06 +00:00
J. Ryan Stinnett
3ff3a3cebd Fix delete button for one session 2020-01-29 19:53:50 +00:00
David Baker
ac173e9d50
Merge pull request #3984 from matrix-org/dbkr/rightpanel_verif_phase 
Fix various races that prevented the right panel being in the right state for verifications
 2020-01-29 18:03:27 +00:00
David Baker
d63bb240aa
those words again 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-01-29 17:52:12 +00:00
David Baker
de6ef9ec90
words 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-01-29 17:51:51 +00:00