Michael Telatynski
b67256c7c2
post-merge fix
2020-01-24 16:41:43 +00:00
Michael Telatynski
342fcb09c4
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration
...
Conflicts:
src/components/views/right_panel/VerificationPanel.js
src/components/views/toasts/VerificationRequestToast.js
2020-01-24 16:19:41 +00:00
Michael Telatynski
7a5e172b88
Apply a huge part of the decorations and copy
2020-01-24 16:16:46 +00: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
ddafd010ee
Merge pull request #3925 from matrix-org/travis/invite-polish
...
Last bit of polish for user lists
2020-01-24 08:57:18 -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
David Baker
9887ba13b5
Merge pull request #3933 from matrix-org/dbkr/stop_giving_jeff_bezos_all_our_money
...
Do less unnecessary work on CI
2020-01-24 15:09:31 +00:00
David Baker
26aaa58e3c
Comments are great
2020-01-24 14:58:46 +00:00
David Baker
b17f38856c
More quote failing
2020-01-24 14:56:00 +00:00
David Baker
de5c47960c
quotes
2020-01-24 14:51:11 +00:00
David Baker
19c49eedec
reskindex for tests
2020-01-24 14:36:12 +00:00
David Baker
57ee99d6f7
chmod
2020-01-24 14:30:41 +00:00
David Baker
5536384866
Do less unnecessary work on CI
...
We were checking out & installing the develop js-sdk explicitly
in cases where we didn't need it at all. We were babeling the src
folder many, many times over (in some cases twice in the same job)
and never using the output at all.
2020-01-24 14:21:28 +00:00
David Baker
75f5326db2
Merge pull request #3932 from matrix-org/dbkr/reenable_stylelint
...
Re-enable stylelint on CI
2020-01-24 14:19:53 +00:00
David Baker
098d097922
Re-enable stylelint on CI
2020-01-24 14:03:31 +00: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
Michael Telatynski
210616c737
Phase 1, split out UserInfo into a generic Pane, use for EncInfo
2020-01-24 11:45: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
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
