PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
21915 commits 1 branch 0 tags 338 MiB
Commit graph

17533 commits

Author SHA1 Message Date
Weblate
aba11f0a2f Merge branch 'origin/develop' into Weblate. 2020-02-12 11:18:37 +00:00
Zoe
466d4a3e51
Merge pull request #4057 from matrix-org/foldleft/12221-secret-storage 
Fixed bug where key reset didn't always return the right key
 2020-02-12 11:18:32 +00:00
Weblate
72f1c2a763 Merge branch 'origin/develop' into Weblate. 2020-02-12 10:04:54 +00:00
Szimszon
3c5abf1fc4 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2119 of 2119 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-02-12 10:04:53 +00:00
Kévin C
790ed65a17 Translated using Weblate (French) 
Currently translated at 100.0% (2119 of 2119 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-02-12 10:04:52 +00:00
Jeff Huang
37435bce45 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2119 of 2119 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-02-12 10:04:51 +00:00
Marco Zehe
8004a35179 Update to use proper quotes and fix code styling. And fix test. 
Signed-off-by: Marco Zehe <marcozehe@mailbox.org>
 2020-02-12 10:54:08 +01:00
Marco Zehe
6fe4eb1fc3 Don't render avatars in pills for screen readers. 
These don't provide any additional information, but add extraneous noise. The link text and title already provide all information. Therefore, mark the avatar inside pills (the mention links inside messages) as hidden. Note that due to the images being part of something focusable, role "presentation" does not work here.

Signed-off-by: Marco Zehe <marcozehe@mailbox.org>
 2020-02-12 09:36:59 +01:00
Travis Ralston
a05dafc300 Check for null config settings a bit safer 
Fixes https://github.com/vector-im/riot-web/issues/12254
 2020-02-12 01:58:21 +00:00
Travis Ralston
9acf70c693 Score user ID searches higher when they match nearly exactly 2020-02-12 01:55:20 +00:00
Hubert Chathi
be70ef44f8 lint 2020-02-11 15:34:14 -05:00
Hubert Chathi
4c5046afd5 refactor event grouping into separate helper classes 2020-02-11 15:19:32 -05:00
Zoe
c8e65bfa65 flip sense of 'force' flag in if statement 2020-02-11 17:56:25 +00:00
Bruno Windels
33f3a61b94 remove unused imports 2020-02-11 18:23:05 +01:00
Bruno Windels
a1844e44f2 remove methods arg to requestVerification(DM) 
as it's easy to have this argument be out of sync from all
the places this is called from the js-sdk. There is also little point,
as you can already specify the methods a consumer of the js-sdk
wants to provide through the verificationMethods option when creating
the client object.
 2020-02-11 18:22:48 +01:00
Weblate
99bbc2bdae Merge branch 'origin/develop' into Weblate. 2020-02-11 17:20:46 +00:00
Bruno Windels
91c9c00712
Merge pull request #4044 from matrix-org/bwindels/riotx-qr-compat 
Make QR self-verification compatible with RiotX
 2020-02-11 17:20:40 +00:00
Zoe
5382a52519 Fixed bug where key reset didn't always return the right key 2020-02-11 15:57:14 +00:00
Weblate
a56d21d80a Merge branch 'origin/develop' into Weblate. 2020-02-11 15:35:30 +00:00
Bruno Windels
7a026eb15d
Merge pull request #4043 from matrix-org/bwindels/showunverifieddevicedialogonclick 
Verify single device from other user in right panel & Not Trusted dialog
 2020-02-11 15:35:24 +00:00
Weblate
0e366c3ddd Merge branch 'origin/develop' into Weblate. 2020-02-11 15:35:06 +00:00
Bruno Windels
1d39aa6a81
Merge pull request #4049 from matrix-org/bwindels/verifybuttonsdisable 
Disable verification buttons after clicking to avoid double submission
 2020-02-11 15:35:00 +00:00
Weblate
f206baadd1 Merge branch 'origin/develop' into Weblate. 2020-02-11 15:34:32 +00:00
Bruno Windels
703f52be33
Merge pull request #4048 from matrix-org/bwindels/toasttuning 
Verification toast fixes
 2020-02-11 15:34:26 +00:00
Bruno Windels
5267dbf44a
Update src/components/views/right_panel/UserInfo.js 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-02-11 15:21:01 +00:00
Weblate
628be1e90a Merge branch 'origin/develop' into Weblate. 2020-02-11 15:16:54 +00:00
Bruno Windels
a84e90df51
Merge pull request #4042 from matrix-org/bwindels/encryptionpaneleverywhere 
Use EncryptionPanel everywhere, part I
 2020-02-11 15:16:47 +00:00
Weblate
ae237901b0 Merge branch 'origin/develop' into Weblate. 2020-02-11 13:44:08 +00:00
Zoe
e54d34090a
Merge pull request #4056 from matrix-org/foldleft/12221-temp-remove 
quick fix for cross-signing reset bug
 2020-02-11 13:44:02 +00:00
Zoe
cbb0ad6621 god i hate the i18n linter 2020-02-11 13:20:27 +00:00
Weblate
0482a277e1 Merge branch 'origin/develop' into Weblate. 2020-02-11 13:19:24 +00:00
Zoe
8c36792840
Merge pull request #4055 from matrix-org/foldleft/12288-correct-feedback-order 
Fix error message rendering for key entry
 2020-02-11 13:19:18 +00:00
Zoe
627ced3838 quick fix for cross-signing reset bug 2020-02-11 13:17:18 +00:00
Zoe
a677780889 i18n 2020-02-11 12:05:58 +00:00
Zoe
6b6d612041 Fix error message rendering for key entry 
Relates to https://github.com/vector-im/riot-web/issues/12288
 2020-02-11 12:02:12 +00:00
Weblate
b8e75ef440 Merge branch 'origin/develop' into Weblate. 2020-02-11 10:18:49 +00:00
Michael Telatynski
67aa241ee5
Merge pull request #4052 from matrix-org/t3chguy/recaptcha_protocol 
Fix recaptcha blocked by CSP for non-SSL origins
 2020-02-11 10:18:44 +00:00
Weblate
56b723353b Merge branch 'origin/develop' into Weblate. 2020-02-11 10:11:26 +00:00
Michael Telatynski
ee819dfdf8 fix call to SettngsStore.watchSetting, it takes a roomID 2020-02-11 09:32:09 +00:00
Weblate
70d12607dd Merge branch 'origin/develop' into Weblate. 2020-02-11 09:30:35 +00:00
Michael Telatynski
f381099f2a
Merge pull request #4053 from matrix-org/t3chguy/server_enter 
Allow custom hs url submission on enter
 2020-02-11 09:30:29 +00:00
Weblate
da737952ec Merge branch 'origin/develop' into Weblate. 2020-02-11 08:19:39 +00:00
Kévin C
136dca7837 Translated using Weblate (French) 
Currently translated at 100.0% (2110 of 2110 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-02-11 08:19:39 +00:00
Stanislav Lukeš
5436662d92 Translated using Weblate (Czech) 
Currently translated at 98.7% (2082 of 2110 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2020-02-11 08:19:39 +00:00
Jeff Huang
dd4aaf230a Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2110 of 2110 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-02-11 08:19:38 +00:00
Besnik Bleta
f5111a6290 Translated using Weblate (Albanian) 
Currently translated at 99.7% (2103 of 2110 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-02-11 08:19:37 +00:00
Bruno Windels
1e94929b88
Merge pull request #4045 from matrix-org/bwindels/qrcodetuning 
Support keepSecretStoragePassphraseForSession at the config level too
 2020-02-11 08:19:29 +00:00
Michael Telatynski
f01b4fe241 Allow custom hs url submission on enter 2020-02-10 20:47:27 +00:00
Michael Telatynski
86306e3da3 Recaptcha should always be loaded over https 2020-02-10 20:41:16 +00:00
Weblate
8365f9d88d Merge branch 'origin/develop' into Weblate. 2020-02-10 18:01:58 +00:00
Michael Telatynski
b9db0ad013
Merge pull request #4047 from matrix-org/t3chguy/hide_typing_notifs 
Add setting to allow hiding of typing indicator
 2020-02-10 18:01:52 +00:00
Weblate
39318d6c6a Merge branch 'origin/develop' into Weblate. 2020-02-10 17:14:11 +00:00
Zoe
d47d13256f
Merge pull request #4041 from matrix-org/foldleft/12221-reset-cross-signing 
Button to reset cross-signing and SSSS keys
 2020-02-10 17:14:05 +00:00
Zoe
2d42505124 and re-run yarn i18n 2020-02-10 17:00:03 +00:00
Zoe
4f4b52d666
Update src/components/views/settings/CrossSigningPanel.js 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-02-10 16:59:17 +00:00
Bruno Windels
9dde09d36f cleanup 2020-02-10 17:35:10 +01:00
Travis Ralston
ccde5530d2 Add reciprocate as a method 2020-02-10 17:34:45 +01:00
Travis Ralston
afc38b92a0 Always send scan for RiotX (for now) 2020-02-10 17:33:19 +01:00
Travis Ralston
ea7cb6ba0b Support keepSecretStoragePassphraseForSession at the config level too 2020-02-10 17:15:08 +01:00
Bruno Windels
4b8382b5c4 remove dead code 2020-02-10 17:07:02 +01:00
Bruno Windels
1ff1575b42 remove dead code 2020-02-10 16:59:47 +01:00
Zoe
69dc725006 rename button 2020-02-10 15:43:02 +00:00
Bruno Windels
936b40f6b5 remove commented out code 2020-02-10 16:19:27 +01:00
Bruno Windels
a693af0c6b fix lint 2020-02-10 16:19:27 +01:00
Bruno Windels
2a8453b939 i18n fixes 2020-02-10 16:19:27 +01:00
Bruno Windels
9059f00b29 move css to correct file 
Move the CSS for the dialog layout used in VerificationPanel to
_VerificationPanel.scss,
and delete the latter as it doesn't have any css of it's own anymore
 2020-02-10 16:19:27 +01:00
Bruno Windels
8c3004c2ac to_device requests now can include .request so we might need send .ready 2020-02-10 16:19:27 +01:00
Bruno Windels
a865cfb013 put encryption in a proper dialog with close button 2020-02-10 16:19:27 +01:00
Bruno Windels
39fab02fcc rename DeviceVerifyOwnDialog to VerificationRequestDialog 
as it works (and we want to use it) for any verification request,
not just between two devices of the same user
 2020-02-10 16:19:27 +01:00
Travis Ralston
ea4d97fa73 Hack in a layout option 2020-02-10 16:19:27 +01:00
Bruno Windels
ee23bfe625 need to close the current dialog before opening a new modal 2020-02-10 16:19:27 +01:00
Bruno Windels
f368339b78 cram EncryptionPanel into a Dialog when clicking from new session dialog 2020-02-10 16:19:27 +01:00
Bruno Windels
b210c9cb76 close dialog after clicking continue 2020-02-10 16:19:27 +01:00
Travis Ralston
469d533964 Apply some CSS 2020-02-10 16:19:27 +01:00
Bruno Windels
747a4866e2 indenting 2020-02-10 16:19:27 +01:00
Bruno Windels
3d91ff23ec cram the EncryptionPanel in CompleteSecurity instead of IncomingSasDialog 
so we get QR code support and support phases prior to STARTED
 2020-02-10 16:19:27 +01:00
Travis Ralston
bc5a59339b Send NewSessionReviewDialog through dialogs 2020-02-10 16:19:27 +01:00
Bruno Windels
5866d67c88 Alterations to DeviceVerifyDialog to support picking QR code 2020-02-10 16:18:44 +01:00
Bruno Windels
6b85ca2fb9 add qr code method to new session dialog 2020-02-10 16:17:49 +01:00
Bruno Windels
496dfc6187 send a .request and open it in the right panel on new session verify 2020-02-10 16:17:05 +01:00
Weblate
2f31a0716a Merge branch 'origin/develop' into Weblate. 2020-02-10 11:56:12 +00:00
catborise
cc5a826869 Translated using Weblate (Turkish) 
Currently translated at 70.6% (1486 of 2105 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-02-10 11:56:12 +00:00
Szimszon
502c32e691 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2105 of 2105 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-02-10 11:56:12 +00:00
Kévin C
23536a7e35 Translated using Weblate (French) 
Currently translated at 100.0% (2105 of 2105 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-02-10 11:56:12 +00:00
J. A. Durieux
444ec33560 Translated using Weblate (Dutch) 
Currently translated at 83.7% (1762 of 2105 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-02-10 11:56:11 +00:00
Stanislav Lukeš
c14f67dba8 Translated using Weblate (Czech) 
Currently translated at 98.6% (2075 of 2105 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2020-02-10 11:56:10 +00:00
Osoitz
7812d821fd Translated using Weblate (Basque) 
Currently translated at 98.6% (2075 of 2105 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2020-02-10 11:56:09 +00:00
Besnik Bleta
91c8ad88d7 Translated using Weblate (Albanian) 
Currently translated at 99.7% (2099 of 2105 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-02-10 11:56:07 +00:00
Michael Telatynski
74af4fd764 disabled submit button be disabled 2020-02-09 15:07:07 +00:00
Michael Telatynski
2230e746aa sprinkle preventDefaults on form submission handlers 2020-02-09 15:03:28 +00:00
Michael Telatynski
0393a57b5a fix submit button disabled breaking async task 2020-02-09 14:49:54 +00:00
Michael Telatynski
150f2b3f84 Merge branches 'develop' and 't3chguy/password_completion' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/password_completion 2020-02-09 14:19:44 +00:00
unknown
06ba55e1a1 I have made changes according to turt2live recommandations, mainly css indentation and variable definition 2020-02-09 15:05:08 +01:00
Michael Telatynski
a8da4a3028 allow hiding of who is typing tile 2020-02-08 21:21:30 +00:00
Michael Telatynski
40b8db84e3 Get rid of dependence on usercontent.riot.im 2020-02-07 22:07:29 +00:00
Bruno Windels
5c89b41177 make device verification go over right panel (after showing dialog) 
dialog should be more or less as in the design
 2020-02-07 18:36:46 +01:00
Bruno Windels
e016cbefff support header image in QuestionDialog 2020-02-07 18:36:41 +01:00
Zoe
a260d7a147 manual lint 2020-02-07 15:53:43 +00:00
Zoe
b08c5d8410 lint 2020-02-07 15:46:31 +00:00
Weblate
f2fee50711 Merge branch 'origin/develop' into Weblate. 2020-02-07 15:38:01 +00:00
random
066faa18f1 Translated using Weblate (Italian) 
Currently translated at 100.0% (2105 of 2105 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-02-07 15:38:01 +00:00
Jeff Huang
ce39d1de70 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2105 of 2105 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-02-07 15:38:00 +00:00
Travis Ralston
3c49515e08
Merge pull request #4001 from matrix-org/travis/qr-code-request-based 
Update QR code rendering to support VerificationRequests
 2020-02-07 15:37:53 +00:00
Travis Ralston
f6abd369ca Fix comments 2020-02-07 15:36:57 +00:00
Travis Ralston
bdeb9cccc4 Rename estimatedTargetDevice to targetDevice 2020-02-07 15:34:45 +00:00
Bruno Windels
1a5bed5a10 open a to_device request in a modal instead of the right panel 1st room 2020-02-07 15:56:10 +01:00
Zoe
8fdae73e03 Button to reset cross-signing and SSSS keys 2020-02-07 14:55:01 +00:00
Bruno Windels
577121e88d disable "verify by emoji" after clicking it 2020-02-07 15:50:51 +01:00
Bruno Windels
413a149b47 disable "Accept"/"Decline" buttons on verif tile after clicking 
to avoid sending double events
 2020-02-07 15:50:42 +01:00
Bruno Windels
049a6d2064 hide toast when request is accepted 
if this is a .request > .ready request, dismissing when in .ready is what we want, as that is how you accept the request
if this is a .start request, we shouldn't dismiss

so only add .ready to the phases to hide the toast, not .started
 2020-02-07 15:49:44 +01:00
Bruno Windels
fa13bb9689 make the verif toast work with to_device request that do .request/.ready 2020-02-07 15:49:36 +01:00
Weblate
999414dc66 Merge branch 'origin/develop' into Weblate. 2020-02-07 08:59:04 +00:00
Szimszon
9a0bc15548 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2103 of 2103 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-02-07 08:59:04 +00:00
Sylvestre Ledru
6d0aab2a2d Translated using Weblate (French) 
Currently translated at 100.0% (2103 of 2103 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-02-07 08:59:03 +00:00
Kévin C
2bafc1ebc8 Translated using Weblate (French) 
Currently translated at 100.0% (2103 of 2103 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-02-07 08:59:03 +00:00
Bruno Windels
720450f372
Merge pull request #4038 from matrix-org/bwindels/4sunlockpurpose 
Differentiate AccessSecretStorageDialog dismiss dialog based on which key we want to read
 2020-02-07 08:58:53 +00:00
Weblate
d7e4b6105b Merge branch 'origin/develop' into Weblate. 2020-02-06 21:13:03 +00:00
Szimszon
f620cc05e2 Translated using Weblate (Hungarian) 
Currently translated at 99.7% (2097 of 2103 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-02-06 21:13:03 +00:00
J. Ryan Stinnett
a160fbf0cc
Merge pull request #4039 from matrix-org/jryans/rvs-spam 
Only emit in RoomViewStore when state actually changes
 2020-02-06 21:12:54 +00:00
J. Ryan Stinnett
c916ef4534 Only emit in RoomViewStore when state actually changes 
This adds a shallow state check to attempt to only emit a store update when
something actually changes.

Fixes https://github.com/vector-im/riot-web/issues/12256
 2020-02-06 17:57:17 +00:00
Weblate
747971d6e5 Merge branch 'origin/develop' into Weblate. 2020-02-06 16:09:21 +00:00
Stanislav Lukeš
1105c14fdd Translated using Weblate (Czech) 
Currently translated at 98.0% (2059 of 2101 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2020-02-06 16:09:21 +00:00
Bruno Windels
cd65cab2e2
Merge pull request #4029 from matrix-org/bwindels/onlyexplicitdismissmodal 
Mark AccessSecretStorageDialog to not be closed by clicking background
 2020-02-06 16:09:11 +00:00
Bruno Windels
02d169060d differentiate dismiss dialog based on name passed from js-sdk 
also make dialog a bit nicer with more descriptive button
 2020-02-06 16:51:02 +01:00
Bruno Windels
a8958458aa fix lint, add jsdoc 2020-02-06 15:29:35 +01:00
Bruno Windels
cf7ad725a6 copy and i18n 2020-02-06 15:18:25 +01:00
Stanislav Lukeš
fba314d65f Translated using Weblate (Czech) 
Currently translated at 96.1% (2020 of 2101 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2020-02-06 13:52:23 +00:00
Jeff Huang
c93e098d4c 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-06 13:52:21 +00:00
Weblate
8cfe56159d Merge branch 'origin/develop' into Weblate. 2020-02-06 12:53:53 +00:00
random
f1d7cf6a56 Translated using Weblate (Italian) 
Currently translated at 99.9% (2100 of 2101 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-02-06 12:53:53 +00:00
Szimszon
34a67bf144 Translated using Weblate (Hungarian) 
Currently translated at 98.4% (2068 of 2101 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-02-06 12:53:43 +00:00
Kévin C
a6dd0d01e4 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-06 12:53:37 +00:00
J. A. Durieux
05fc6c11b0 Translated using Weblate (Dutch) 
Currently translated at 83.6% (1756 of 2101 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-02-06 12:53:37 +00:00
Stanislav Lukeš
5b04ad46e0 Translated using Weblate (Czech) 
Currently translated at 94.7% (1990 of 2101 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2020-02-06 12:53:30 +00:00
J. Ryan Stinnett
c3f4eaf4e5
Merge pull request #4035 from matrix-org/jryans/seshat-rooms-i18n 
Improve event indexing status strings for translation
 2020-02-06 12:53:10 +00:00
Bruno Windels
4cd4110a52 fixup: this is already done in _buildModal 2020-02-06 13:13:37 +01:00
Bruno Windels
70a4d3415e confirm to close the passphrase dialog if it was done by backgroundClick 
as it is easy to do by accident
 2020-02-06 13:11:24 +01:00
Bruno Windels
c44ebef06f add onBeforeClose option to Modal 
so we can throw up another "are you sure" dialog
in the cases we want to do so. This also
passes a reason so we can only do so for ways of
dismissing (like backgroundClick)
that are easy to do by accident.
 2020-02-06 13:10:06 +01:00
Bruno Windels
7e07a42dc1 resolve finished promise when closing dialog by clicking background 
... by calling the same close method as otherwise and not
have a special path that just calls the onFinished callback.
This will also not close all the dialogs anymore,
but that sort of seems like the intented behaviour?
 2020-02-06 13:07:13 +01:00
Michael Telatynski
4d0d6cdaa4
Merge branch 'develop' into t3chguy/password_completion 2020-02-05 20:24:37 +00:00
Bruno Windels
a0c2a39dc7 make a static dialog close again if background is clicked 2020-02-05 13:43:30 +01:00
Michael Telatynski
d8d8dd4508
Merge pull request #4034 from matrix-org/t3chguy/s1 
Only enumerate settings handlers which are supported
 2020-02-05 10:16:03 +00:00
J. Ryan Stinnett
110c5f0e61 Fix listener removal in verification tile 
Fixes https://github.com/matrix-org/riot-web-rageshakes/issues/2202
 2020-02-04 23:13:55 +00:00
J. Ryan Stinnett
b92fe59436 Improve event indexing status strings for translation 
The strings used for the count of rooms was hard to translate, so this adds a
bit more context.
 2020-02-04 23:09:49 +00:00
Zoe
f89ae19d76
Merge pull request #4028 from matrix-org/foldleft/12114-less-alarming-on-own-devices 
Do not show alarming red shields on large encrypted rooms for your own device
 2020-02-04 17:09:16 +00:00
Michael Telatynski
d585dbab02 Merge branches 'develop' and 't3chguy/s1' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/s1 2020-02-04 15:48:04 +00:00
Michael Telatynski
e23a3e98be Only enumerate settings handlers which are supported currently 2020-02-04 15:27:38 +00:00
rtestard
f023bcfd63 I have modified padlocks styling when the left panel is collapsed 2020-02-04 15:05:26 +01: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
Bob
9cf53aa9d8 Only return formatted text when necessary (for escaped chars) 
Signed-off-by: Bob Rao <bob+git@vulpin.com>
 2020-02-02 16:34:19 +11: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
BobVul
fde30577e4 Fix escaped markdown passing backslashes through 
Fixes https://github.com/vector-im/riot-web/issues/11230

Signed-off-by: Bob Rao <bob+git@vulpin.com>
 2020-01-31 12:33:57 +11: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
Bruno Windels
ad458722dc evaluate on mount whether we need to call .verify() 
as the request might be in phase started already.
 2020-01-29 17:58:23 +01:00