OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
21,158 Commits
203 Branches
553 Tags
456 MiB
Commit Graph

21158 Commits (c4f16591161bfc261a9c7fd34b0525962481bb75)

Author SHA1 Message Date
Bruno Windels 66768416a6 dont assume the room exist ... not sure why though 2020-01-24 14:20:48 +01:00
Weblate 27ffa88ff8 Merge branch 'origin/develop' into Weblate. 2020-01-24 13:18:15 +00:00
Michael Telatynski 2c40b73ff6
Merge pull request #3910 from matrix-org/t3chguy/cross-signing-composer 
Cross Signing redesign for composer
 2020-01-24 13:18:09 +00:00
David Baker 590ff29e60 Unused import 2020-01-24 13:15:57 +00:00
David Baker c5ecd83bc1 remove .orig file 2020-01-24 12:34:50 +00:00
David Baker dbf1c9a02a Apparently i18n... 2020-01-24 12:34:03 +00:00
David Baker 688f7029d2 Split AsyncWrapper out from Modal 
So we can use it outside of modals & dialogs
 2020-01-24 12:28:03 +00:00
Zoe a6fcbcacf6 Seperates out the padlock icon, and adds a tooltip 
Fixes https://github.com/vector-im/riot-web/issues/11840
 2020-01-24 12:06:21 +00:00
Michael Telatynski 210616c737 Phase 1, split out UserInfo into a generic Pane, use for EncInfo 2020-01-24 11:45:39 +00:00
Weblate f4e5b69aa3 Merge branch 'origin/develop' into Weblate. 2020-01-24 11:24:39 +00:00
Bruno Windels b66154330c
Merge pull request #3927 from matrix-org/bwindels/fixverifyowndevice 
Fix verifying your own devices with to_device messages
 2020-01-24 11:24:33 +00:00
Weblate 423786807f Merge branch 'origin/develop' into Weblate. 2020-01-24 11:14:59 +00:00
Zoe 1d686fe49e
Merge pull request #3908 from matrix-org/zip/11935-room-list-decoration 
Room list reflects encryption state
 2020-01-24 11:14:53 +00:00
Bruno Windels 6cce65a2a5 fix lint 2020-01-24 12:08:47 +01:00
Damir Jelić ecfecfe559 EventIndex: Fix a small style issue. 2020-01-24 12:07:03 +01:00
Zoe 395c82b1e5
Update src/components/structures/RoomView.js 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-01-24 11:04:40 +00:00
Bruno Windels 512bd4b0b2 show to_device verification in dialog, not right panel 
this also makes it work again, as the VerificationPanel doens't
know how to deal with requests that are already in PHASE_STARTED,
which was breaking verifying your own devices.
 2020-01-24 11:59:17 +01:00
Bruno Windels 2483337e89 don't use removed .event property anymore on verification request 2020-01-24 11:59:01 +01:00
Damir Jelić 029369a04b EventIndexPanel: Small style fix. 2020-01-24 11:56:43 +01:00
Damir Jelić ee133a9c71 DisableEventIndexDialog: Remove an unused import. 2020-01-24 11:56:19 +01:00
Damir Jelić 0c3d507455 EventIndex: Cancel the crawler early after a message request. 
If we're cancelling the crawler nowadays this means that we're likely
deleting the index. Processing these messages is wasted effort in that
case so break early.
 2020-01-24 11:46:46 +01:00
Damir Jelić ffe5d411db EventIndexPanel: Add a link to the download page of Riot Desktop. 2020-01-24 11:44:56 +01:00
Damir Jelić 38b1663755 EventIndex: Subclass the event emitter instead of putting one in a property. 2020-01-24 11:28:33 +01:00
Damir Jelić 6f919eaeec DisableEventIndexDialog: Use the correct spinner. 2020-01-24 11:27:56 +01:00
Weblate b7c9f5307d Merge branch 'origin/develop' into Weblate. 2020-01-24 10:22:22 +00:00
Michael Telatynski 0078c2f099
Merge pull request #3914 from matrix-org/t3chguy/userinfo_scroll 
Make the entire User Info scrollable, sticky close button
 2020-01-24 10:22:17 +00:00
Damir Jelić 825b6f7b7d EventIndexPeg: Style fix for a docstring. 2020-01-24 11:16:49 +01:00
Damir Jelić d9e933c915 EventIndex: Style fixes for the docstrings. 2020-01-24 11:15:57 +01:00
Damir Jelić 660240e2c0 EventIndexPanel: Use formatCount to format the room count. 2020-01-24 11:13:09 +01:00
Michael Telatynski b72ab57e1b add <Tooltip/> to <E2EIcon/> 2020-01-24 10:13:03 +00:00
Damir Jelić 128c0b7300 ManageEventIndexDialog: Use formatCount to format the message and room count. 2020-01-24 11:11:53 +01:00
Damir Jelić 71024d1418 ManageEventIndexDialog: Properly indent the content of the BaseDialog. 2020-01-24 11:03:40 +01:00
Damir Jelić cba7764784 DisableEventIndexDialog: Use the DialogButtons element for the buttons. 2020-01-24 11:00:28 +01:00
Weblate c0d034a1c4 Merge branch 'origin/develop' into Weblate. 2020-01-24 09:50:30 +00:00
David Baker 50b05551ba
Merge pull request #3916 from matrix-org/dbkr/security_dialog_noheader 
Remove riot logo from the security setup screens
 2020-01-24 09:50:25 +00:00
Weblate 20da361acd Merge branch 'origin/develop' into Weblate. 2020-01-24 09:38:33 +00:00
Kévin C 169852adec Translated using Weblate (French) 
Currently translated at 100.0% (2053 of 2053 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-01-24 09:38:32 +00:00
David Baker 81caa12b16
Merge pull request #3917 from matrix-org/dbkr/complete_security_detect_success 
Only say the session is verified if it is now verified
 2020-01-24 09:38:25 +00:00
David Baker 99252e08b0 Unintentional commit 2020-01-24 09:37:43 +00:00
David Baker cd4e75c378 Unnecessary blank line 2020-01-24 09:36:22 +00:00
Damir Jelić 72a58d0c2c DisableEventIndexDialog: Properly indent the content of the BaseDialog. 2020-01-24 09:59:26 +01:00
Damir Jelić b59863781f DisableEventIndexDialog: Fix a typo. 2020-01-24 09:58:17 +01:00
Damir Jelić 93facca479 ManageEventIndex: Rename the file to contain the Dialog suffix. 2020-01-24 09:54:46 +01:00
Damir Jelić f763ae3c7b DisableEventIndex: Rename the file to contain the Dialog suffix. 2020-01-24 09:50:58 +01:00
Damir Jelić 4ea2d4f90e ManageEventIndex: Rewrite the docs and rename the dialog class. 2020-01-24 09:45:29 +01:00
Damir Jelić d30fd3eac0 DisableEventIndex: Rename the class. 2020-01-24 09:39:56 +01:00
Damir Jelić 86a098fcd9 DisableEventIndex: Remove a blank line and rewrite a doc comment. 2020-01-24 09:39:40 +01:00
Travis Ralston 12fa94106e Actually add the secret to the QR code url 2020-01-23 20:19:17 -07:00
Travis Ralston b7e680ba51 Fix key ID 2020-01-23 20:14:27 -07:00
Travis Ralston 0ce9da5d36 Appease the linter 2020-01-23 20:12:24 -07:00