Commit graph

16649 commits

Author SHA1 Message Date
Travis Ralston
91d59556db Also check for our own key ID 2020-01-24 09:37:12 -07:00
Travis Ralston
f8e0dcf264 Add null check for cross-signing info in verification panel 2020-01-24 09:33:55 -07:00
Travis Ralston
169ca4a4da
Merge pull request #3926 from matrix-org/travis/event-tile-trace
Add trace logging to figure out which component is causing weird events
2020-01-24 08:57:43 -07:00
Travis Ralston
9722b34c35
Merge pull request #3906 from matrix-org/travis/user-lists-labs
Remove user lists feature flag, making it the default
2020-01-24 08:57:27 -07:00
Travis Ralston
abc2808b62 Fix i18n post-merge 2020-01-24 08:57:03 -07:00
Travis Ralston
5f2df15987
Merge branch 'develop' into travis/invite-polish 2020-01-24 08:56:18 -07:00
Travis Ralston
eb2402609a
Merge pull request #3871 from matrix-org/travis/qr-verif-rp
QR code verification
2020-01-24 08:55:40 -07:00
Zoe
543be90eda
Merge pull request #3931 from matrix-org/foldleft/12035-room-decoration-design-pass
Design pass for room icons
2020-01-24 13:54:51 +00:00
Damir Jelić
cbfde4d78f Merge branch 'poljar/seshat-filepanel' into develop 2020-01-24 14:44:24 +01:00
Zoe
75da5b7944 Design pass for room icons 2020-01-24 13:37:47 +00:00
David Baker
7de5f09f9f
Merge pull request #3928 from matrix-org/dbkr/split_out_asyncwrapper
Split AsyncWrapper out from Modal
2020-01-24 13:31:09 +00:00
David Baker
330f606513
Merge pull request #3930 from matrix-org/bwindels/fixnoroom
Fix error in verification code on develop
2020-01-24 13:30:25 +00:00
Zoe
131aacd3ab
Merge pull request #3929 from matrix-org/zip/11840-tooltips-on-padlocks
Seperates out the padlock icon, and adds a tooltip
2020-01-24 13:26:59 +00:00
Damir Jelić
37f289b120 EventIndex: Add docstrings for the FilePanel methods. 2020-01-24 14:24:25 +01:00
Damir Jelić
3534cd4202 FilePanel: Add comments to explain what's going on with the event index. 2020-01-24 14:23:43 +01:00
Bruno Windels
66768416a6 dont assume the room exist ... not sure why though 2020-01-24 14:20:48 +01: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
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
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
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
Michael Telatynski
b72ab57e1b add <Tooltip/> to <E2EIcon/> 2020-01-24 10:13:03 +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
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
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
Travis Ralston
ebcc4d573b Add trace logging to figure out which component is causing weird events
For https://github.com/vector-im/riot-web/issues/11120
2020-01-23 20:10:31 -07:00
Travis Ralston
b682e7d908 Generate a QR code for apps to scan 2020-01-23 20:05:32 -07:00
Travis Ralston
586a240e41 Don't use private keys for QR code 2020-01-23 19:29:54 -07:00
Travis Ralston
1ec746c014 Add verification with QR codes 2020-01-23 19:29:54 -07:00
Travis Ralston
32f9a4e623 Add some debugging around the recently DM'd users
The suggestions are relatively stable, but the recents have some issues. Adding logging to the suggestions would also destroy the console log with thousands of messages whereas recents aren't too bad.
2020-01-23 17:35:36 -07:00
Travis Ralston
442ab9f301 Clear the filter when a suggestion is accepted/added 2020-01-23 17:27:37 -07:00
Travis Ralston
b5f22001b1 Fix copy 2020-01-23 17:22:39 -07:00
Travis Ralston
1394331133 Fix booleans 2020-01-23 16:33:33 -07:00
Travis Ralston
c22bfa84b7 Hide password section if you can't change your password
Fixes https://github.com/vector-im/riot-web/issues/11950
2020-01-23 16:29:55 -07:00
Travis Ralston
915c4efeac Ensure a plaintext version of the composer ends up on the clipboard
Fixes https://github.com/vector-im/riot-web/issues/12018
2020-01-23 15:53:32 -07:00
Travis Ralston
18f8f8858c Don't list every single alias when there's many 2020-01-23 15:00:18 -07:00
Travis Ralston
1ac82a9f16 Revert "Don't list every single alias when there's many"
This reverts commit 6fc647c3d9.
2020-01-23 15:00:02 -07:00