Commit graph

10541 commits

Author SHA1 Message Date
Jorik Schellekens
57d880ca5e Use correct name and indentation 2020-04-28 14:24:44 +01:00
Jorik Schellekens
175b5e70b6 Lint Slider 2020-04-28 14:20:49 +01:00
Jorik Schellekens
137b94703a Lint types 2020-04-28 14:20:49 +01:00
Jorik Schellekens
c268b98ded
Use faster lookup method
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2020-04-28 14:17:50 +01:00
Jorik Schellekens
a8407c9508
Use purecomponent
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2020-04-28 14:00:15 +01:00
Jorik Schellekens
cf05beb4b8
Merge pull request #4355 from JorikSchellekens/joriks/font-scaling-fixes
Fix scaling issues
2020-04-28 13:47:50 +01:00
Zoe
9d1c73348c Show progress when loading keys 2020-04-28 11:32:51 +01:00
David Baker
60d51a0f1e
Merge pull request #4506 from matrix-org/dbkr/aggregate_device_verify_toasts
Aggregate device verify toasts
2020-04-28 11:00:52 +01:00
David Baker
4dca66d140 No need for this if statement now 2020-04-28 09:43:24 +01:00
Michael Telatynski
2792988ad1 Revert "Make Screens an enum"
This reverts commit f6492918

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-27 23:59:07 +01:00
Michael Telatynski
3e35cffae7 null-guards
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-27 23:53:32 +01:00
Michael Telatynski
a5830c229e more tidying
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-27 23:30:40 +01:00
Michael Telatynski
c7870090f8 clean ups
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-27 23:29:38 +01:00
Michael Telatynski
83a4558d49 remove RedactedGrouper for now
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-27 23:27:46 +01:00
Michael Telatynski
a399b1018a fix flashing by ""
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-27 23:16:08 +01:00
Michael Telatynski
9dd204dd10 Merge branches 'develop' and 't3chguy/redaction_redesign' of github.com:matrix-org/matrix-react-sdk into t3chguy/redaction_redesign 2020-04-27 23:09:08 +01:00
David Baker
7e956514a2 Lint 2020-04-27 20:35:39 +01:00
David Baker
ff1fd15e72 Use the New Session review dialog for verifying our own devices 2020-04-27 20:31:14 +01:00
J. Ryan Stinnett
b396096cd2 Fix set up encryption toast to have use "set up" as action
This changes the "set up encryption" toast to use "set up" as the primary action
button, instead of "upgrade". Other toasts that do use text about upgrading will
keep their primary action text of "upgrade" as before.

Fixes https://github.com/vector-im/riot-web/issues/13231
2020-04-27 18:35:51 +01:00
David Baker
3bdd24ce83 Make close button work from user info view
Adds more hacks so that the close button does something vagauely
plausible in all situations.
2020-04-27 18:34:48 +01:00
David Baker
a5ee99b858 Aggregate device verification toasts into one toast
'Review' now opens the only place we can verify our own devices:
our user info.
2020-04-27 18:33:54 +01:00
Jorik Schellekens
00c0212c03 Revert previous fix 2020-04-27 17:35:52 +01:00
Jorik Schellekens
c995e2e021 Fix info avatar 2020-04-27 17:29:03 +01:00
Jorik Schellekens
b567b95fad Lint 2020-04-27 17:27:54 +01:00
Jorik Schellekens
bfba5e6cfe Fix member info avatar size 2020-04-27 16:57:38 +01:00
David Baker
5d4aa03c8e Lint 2020-04-27 14:43:17 +01:00
David Baker
03d89361cd Update to (almost) match design 2020-04-27 14:35:32 +01:00
Michael Telatynski
a58fd6c475 delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-27 14:27:41 +01:00
David Baker
ca0cede1aa Add a link from settings / devices to your user profile
Temporarily until you can verify devices in settings

Fixes https://github.com/vector-im/riot-web/issues/13401
2020-04-27 14:25:47 +01:00
Michael Telatynski
606940bd77 Update Invite Dialog copy to include email addresses
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-27 14:07:39 +01:00
Jorik Schellekens
b4dcd50d56 Use camel case on import 2020-04-27 11:51:56 +01:00
Jorik Schellekens
c3ba7a8c91 Tweak read receipt remainder text 2020-04-27 11:51:56 +01:00
Jorik Schellekens
cef6868f02 Resize room list scroll section.
This fix isn't perfect. Currently the scroll view is
slightly smaller than the list of rooms. I think it has something
to do with the how the heigh is calculate in js, considering it has
some assumptions about the height of each bar and the padding. However
room items are the only things which change with respect to the root
value. Therefore the item list is actually taller than the computed
pixel value of the list converted to rems.

I'll look into it.
2020-04-27 11:51:55 +01:00
Jorik Schellekens
ff1544b783 Fix read receipt horizontal spacing at scale 2020-04-27 11:51:54 +01:00
Jorik Schellekens
3f56ed393d Use a function to convert to rem. 2020-04-27 11:51:54 +01:00
Jorik Schellekens
e2aef3a62b Fix pills.
This was a hard pill to swallow
2020-04-27 11:51:54 +01:00
Agusti Bau
98a949bed1 Refactored DNDTagTile to use useContextMenu
Signed-off-by: Agusti Bau <agustibau@gmail.com>
2020-04-26 18:54:35 +02:00
Pauli Virtanen
d690d4bed2 Prevent PersistedElements overflowing scrolled areas
As the DOM element is not in reality contained inside "the parent",
it may overflow the area if the parent gets partially hidden by
scrolling etc.

To make the effect visually less annoying, emulate this by clipping to
the element wrapper. This is not a full general-purpose fix, but
improves the current situation.

Signed-off-by: Pauli Virtanen <pav@iki.fi>
2020-04-25 16:09:46 +03:00
Agusti Bau
5f3e3b3ec2 Extracted context menu from TagTile to DNDTagTile 2020-04-25 01:09:07 +02:00
David Baker
121ac14273
Merge pull request #4485 from matrix-org/dbkr/setup_encryption_dialog_icon
Make icon change in SetupEncryptionDialog
2020-04-24 18:56:40 +01:00
David Baker
6460f6303c Move store subscribe to didmount 2020-04-24 17:36:02 +01:00
Travis Ralston
117322b3b5 Remove invite only padlocks feature flag
Fixes https://github.com/vector-im/riot-web/issues/13366

Only known issue on this is https://github.com/vector-im/riot-web/issues/12148

This has been pre-approved by Product.
2020-04-24 10:05:28 -06:00
David Baker
bbce37b92f Make icon change in SetupEncryptionDialog
Fixes https://github.com/vector-im/riot-web/issues/13368
2020-04-24 15:39:54 +01:00
Michael Telatynski
d3b0e008c1 first draft of Redaction ELS
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-24 15:39:23 +01:00
Michael Telatynski
e16f511527 Redesign redactions
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-24 15:07:39 +01:00
Travis Ralston
50783c2432 Appease the linter 2020-04-23 23:25:53 -06:00
Travis Ralston
28865e27bc Don't overwrite the 'domain' data key for all widgets
Some widgets, which aren't Jitsi widgets, might need this to be something else.
2020-04-23 15:24:27 -06:00
Travis Ralston
efaf4fbbda Decode dollar signs in safe widget URLs before rendering/templating
Fixes https://github.com/vector-im/riot-web/issues/13344
2020-04-23 15:24:27 -06:00
Pauli Virtanen
3962c98c9b Ensure PersistedElements are refreshed when AuxPanel scrolls
If the screen is not tall enough, AuxPanel starts scrolling its content.
If it contains PersistedElements, they need to be notified about
scrolling as they only listen on resize events to move their element.

Signed-off-by: Pauli Virtanen <pav@iki.fi>
2020-04-23 23:27:56 +03:00
J. Ryan Stinnett
5af3d83cc7 Fix recovery link on login verification flow
This fixes the recovery link to go to the right place.

Fixes https://github.com/vector-im/riot-web/issues/13346
2020-04-23 18:14:30 +01:00
Michael Telatynski
531de19fa4 Revert "Discard unused CompatibilityPage.js in react-sdk"
This reverts commit e3ba9c9b

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-23 16:11:58 +01:00
Michael Telatynski
e3ba9c9b38 Discard unused CompatibilityPage.js in react-sdk
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-23 16:11:29 +01:00
Travis Ralston
35dd892dce
Merge pull request #4458 from matrix-org/travis/fix-sticker-picker-add
Use WidgetType more often to avoid breaking new sticker pickers
2020-04-23 08:18:12 -06:00
Travis Ralston
d66d497638
Merge pull request #4460 from matrix-org/travis/integ-logging
Update logging for unmanaged widgets, and add TODO comments for other areas
2020-04-23 08:17:54 -06:00
Travis Ralston
3d4032e542
Merge pull request #4459 from matrix-org/travis/fix-openid-widget
Fix OpenID requests from widgets
2020-04-23 08:17:38 -06:00
Jorik Schellekens
4b4599c1d8 tslint 2020-04-23 14:39:11 +01:00
Jorik Schellekens
a087f5ea40 Lint 2020-04-23 13:55:10 +01:00
Jorik Schellekens
e5cb149296 Handle fontslider input errors correctly 2020-04-23 13:52:08 +01:00
Jorik Schellekens
600a812227 Add brush icon for appearance setting tab 2020-04-23 12:20:10 +01:00
Jorik Schellekens
c86638c667 add toggle between font slider and custom setting 2020-04-23 12:09:08 +01:00
Jorik Schellekens
a16fe09d42 Use em to detach slider from root font-size 2020-04-23 10:58:00 +01:00
Jorik Schellekens
8f0d81e770 Linearly interpolate between value intervals. 2020-04-23 10:45:48 +01:00
Jorik Schellekens
fe175bb9a8 Styling for the font slider 2020-04-23 10:45:48 +01:00
Jorik Schellekens
f5d6590751 Have max and min font configured in settings 2020-04-23 10:45:48 +01:00
Jorik Schellekens
014be5ce5f Add support to disable slider 2020-04-23 10:45:48 +01:00
Jorik Schellekens
ee33fc1c20 Remove labels 2020-04-23 10:45:48 +01:00
Jorik Schellekens
5f50facfba Make slider independant of label size 2020-04-23 10:45:48 +01:00
Jorik Schellekens
26ccd6f07d Cleaner clamping of value range 2020-04-23 10:45:48 +01:00
Jorik Schellekens
c99e1de803 Clamp indicated value within value range 2020-04-23 10:45:48 +01:00
Jorik Schellekens
ba362b727c Use onSelectionChange prop 2020-04-23 10:45:48 +01:00
Jorik Schellekens
0d0da6cfdc Fix types, abandon propTypes 2020-04-23 10:45:48 +01:00
Jorik Schellekens
dcea1f32b3 tslint 2020-04-23 10:45:48 +01:00
Jorik Schellekens
315a272cb4 File rename 2020-04-23 10:45:48 +01:00
Jorik Schellekens
4525f71b1c Missed an import 2020-04-23 10:45:47 +01:00
Jorik Schellekens
82974bd98c Space out ternaries
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2020-04-23 10:45:47 +01:00
Jorik Schellekens
e254675287 Retain copyright
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2020-04-23 10:45:47 +01:00
Jorik Schellekens
abd94a65bd Move compoenets/FontSlider to views/Slider 2020-04-23 10:45:47 +01:00
Jorik Schellekens
dd841fcde9 Remove references to font 2020-04-23 10:45:47 +01:00
Jorik Schellekens
db1141b162 Move to typescript 2020-04-23 10:45:47 +01:00
Jorik Schellekens
4d0cac1260 Render should be last method declared 2020-04-23 10:45:47 +01:00
Jorik Schellekens
7c9df04d42 Use "Appearance" instead of "Style" 2020-04-23 10:45:47 +01:00
Jorik Schellekens
f1130ecba1 Linting. Finally set up my linter properly 2020-04-23 10:45:47 +01:00
Jorik Schellekens
66fd0f707f Type enforcement and comments 2020-04-23 10:45:47 +01:00
Jorik Schellekens
8b72756b8d Use the font slider 2020-04-23 10:45:47 +01:00
Jorik Schellekens
df73f12320 Make a font slider 2020-04-23 10:45:47 +01:00
Jorik Schellekens
0faf7b865f Set font option width 2020-04-23 10:45:47 +01:00
Jorik Schellekens
14551b1885 Hide font scaling behind labs 2020-04-23 10:45:47 +01:00
Jorik Schellekens
af4dd2770c Respond to font size changes 2020-04-23 10:45:47 +01:00
Jorik Schellekens
c1827925da Use new style tab 2020-04-23 10:45:47 +01:00
Jorik Schellekens
269621ad24 Move theme settings to a new tab 2020-04-23 10:45:47 +01:00
Jorik Schellekens
42ec21f5bb Tweak read receipt remainder text 2020-04-23 10:45:47 +01:00
Jorik Schellekens
38919518da Resize room list scroll section.
This fix isn't perfect. Currently the scroll view is
slightly smaller than the list of rooms. I think it has something
to do with the how the heigh is calculate in js, considering it has
some assumptions about the height of each bar and the padding. However
room items are the only things which change with respect to the root
value. Therefore the item list is actually taller than the computed
pixel value of the list converted to rems.

I'll look into it.
2020-04-23 10:45:46 +01:00
Jorik Schellekens
c6bc0c7914 Fix read receipt horizontal spacing at scale 2020-04-23 10:45:46 +01:00
Jorik Schellekens
05d11fea69 Use a function to convert to rem. 2020-04-23 10:45:46 +01:00
Jorik Schellekens
1ff0f3445a Fix pills.
This was a hard pill to swallow
2020-04-23 10:45:46 +01:00
Michael Telatynski
f64929187a Make Screens an enum
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-23 10:44:35 +01:00
J. Ryan Stinnett
4a0f228714
Merge pull request #4467 from matrix-org/travis/seshat-enable
Take encrypted message search out of labs
2020-04-23 10:21:58 +01:00
Michael Telatynski
e06b5f8cf3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/app_load4 2020-04-23 10:12:56 +01:00
Michael Telatynski
4cf234197b iterate PR
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-23 10:12:50 +01:00
Michael Telatynski
a3f4244dc0
Merge pull request #4472 from matrix-org/t3chguy/complete_security_designs
Update login security copy and design to match Figma
2020-04-22 23:07:48 +01:00
Michael Telatynski
80b8120bc3 Update login security copy and design to match Figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 22:32:02 +01:00
Michael Telatynski
b10a386675 Fix i18n of SSO UIA copy in Deactivate Account Dialog
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 21:37:52 +01:00
Sergey Shpikin
ae3dcff230 Assert type of domNode as HTMLElement to fix build
Signed-off-by: Sergey Shpikin <rkfg@rkfg.me>
2020-04-22 22:03:33 +03:00
Agusti Bau
2471b3c100
Update src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
Co-Authored-By: Michael Telatynski <7t3chguy@googlemail.com>
2020-04-22 20:03:22 +02:00
Agusti Bau
5163232081
Update src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
Co-Authored-By: Michael Telatynski <7t3chguy@googlemail.com>
2020-04-22 20:03:13 +02:00
Travis Ralston
27138b33c0 Match settings paragraph style in all cases 2020-04-22 11:08:46 -06:00
Travis Ralston
3662c9e1c1 Appease the linter 2020-04-22 11:05:43 -06:00
Travis Ralston
fdcdd2529e Take encrypted message search out of labs
Fixes https://github.com/vector-im/riot-web/issues/13262

This is part of the cross-signing shipping master plan. Known issues relating to this feature are:
* https://github.com/vector-im/riot-web/issues/12896
* https://github.com/vector-im/riot-web/issues/12385
* https://github.com/vector-im/riot-web/issues/11831
* https://github.com/vector-im/riot-web/issues/11155

In theory, these are issues we're comfortable with shipping as we're already enabling it by default. This just makes it easier on everyone by removing the flag (making it still enabled by default).
2020-04-22 10:58:11 -06:00
Agusti Bau
ff3272061c Fixed linter errors
Signed-off-by: Agusti Bau <agustibau@gmail.com>
2020-04-22 17:19:03 +02:00
Agusti Bau
cd87124e0f removed console logs
Signed-off-by: Agusti Bau <agustibau@gmail.com>
2020-04-22 17:19:03 +02:00
Agusti Bau
08bac716d5 Disabled unignore button when unignoring in process
Signed-off-by: Agusti Bau <agustibau@gmail.com>
2020-04-22 17:19:03 +02:00
Agusti Bau
47708ca127 Sync settings ignoredUsers with global state
Signed-off-by: Agusti Bau <agustibau@gmail.com>
2020-04-22 17:19:03 +02:00
Agusti Bau
7a42caa326 Fixed Unignore state variable naming missmatch
Signed-off-by: Agusti Bau <agustibau@gmail.com>
2020-04-22 17:19:03 +02:00
Michael Telatynski
ca3ddb3760
Merge pull request #4461 from matrix-org/t3chguy/register_email_not_possible
If user cannot set email during registration don't tell them to
2020-04-22 13:59:43 +01:00
Michael Telatynski
54e976f5a8 delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 13:22:33 +01:00
Michael Telatynski
01abb61e9a C
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 13:08:33 +01:00
Michael Telatynski
89345c9e8b Convert MatrixChat to an ES6 Class Component
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 11:55:03 +01:00
Michael Telatynski
4bbd507e7a If user cannot set email during registration don't tell them to
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 11:33:45 +01:00
Michael Telatynski
dd1f1b3092
Merge pull request #4452 from matrix-org/t3chguy/autocomplete
Convert autocomplete stuff to TypeScript
2020-04-22 10:20:24 +01:00
Zoe
cb84904638
Merge pull request #4455 from matrix-org/foldleft/devtool-verif-back
Add a back button to the devtools verifications panel
2020-04-22 10:15:05 +01:00
Travis Ralston
3a360b91b9 Update logging for unmanaged widgets, and add TODO comments for other areas
Just a minor thing that is bothersome. Renaming classes and functions is a bit more of an impact than is worth right now, so have settled for littering TODO comments all over the place.
2020-04-22 00:34:08 -06:00
Travis Ralston
d851f2e45f Fix OpenID requests from widgets
Fixes https://github.com/vector-im/riot-web/issues/13131

Widgets can request an OpenID token to authenticate the user when the widget is missing authentication information. A common case for this is the Dimension sticker picker: sometimes the Riot is running in doesn't have the configuration to match the Dimension instance, so Riot rightly refuses to send an auth token to the widget. When this happens, it requests a token through postMessage().

There's a toggle on the permission dialog to remember the setting, which is the widget's security key. As an added measure, the security key generation ensures the widget URL matches as the 'remember this choice' toggle will silently work in the background, and it could be dangerous if the widget's URL changed and Riot secretly allows the widget to identify the user. This check was failing because the WidgetMessaging class was being set up with the rendered URL, which will not match the widget's URL at all. To fix this, we simply use the widget's URL to set up the messaging, which by proxy uses the right URL in calculating the security key.
2020-04-22 00:27:20 -06:00
Travis Ralston
f54e99c708 Use WidgetType more often to avoid breaking new sticker pickers
Turns out that setUserWidget() wasn't updated to take a real WidgetType, but the code in ScalarMessaging thought it did. This leads to integration managers trying to add sticker widgets with an object `type` rather than a string `type`, which doesn't work.

This updates other code paths which call into the various widget classes to use WidgetType more often. The actual code path for fixing widgets is resolved in WidgetUtils for the setUserWidget function body.
2020-04-21 16:01:10 -06:00
Michael Telatynski
fd10ab840e undo unrelated change
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-21 18:10:47 +01:00
Michael Telatynski
65b3adfbe3 discard propTypes some more
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-21 18:08:01 +01:00
Michael Telatynski
598cf21684 discard propTypes.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-21 18:01:23 +01:00
Bruno Windels
b8dd68dda2 wait until cross-signing keys are fetched to show verify button 2020-04-21 18:36:15 +02:00
Zoe
61c6c8de45 Add a back button to the devtools verifications panel 2020-04-21 16:27:31 +01:00
Michael Telatynski
bf891c85e8 Enable esModuleInterop and iterate PR
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-21 10:01:05 +01:00
Michael Telatynski
8398e83d33 add more type annotations
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-20 20:35:57 +01:00
Michael Telatynski
5c57b9ab9b delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-20 19:04:55 +01:00
Michael Telatynski
6328a60301 improve member name
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-20 19:02:27 +01:00
Michael Telatynski
fced4ea51e Convert autocomplete stuff to TypeScript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-20 19:00:54 +01:00
Travis Ralston
d8a5ba9b14 Merge branch 'develop' into travis/moar-jitsi 2020-04-20 09:21:48 -06:00
David Baker
30a3600874
Merge pull request #4449 from matrix-org/dbkr/buttonplaceholder_classname
Fix CSS class in ButtonPlaceholder
2020-04-20 14:39:20 +01:00
David Baker
50cc44f0c4 Fix CSS class in ButtonPlaceholder 2020-04-20 14:16:34 +01:00
Michael Telatynski
ccc1f1fe37
Merge pull request #4441 from matrix-org/t3chguy/login-tab
Password Login make sure tab takes user to password field
2020-04-20 13:57:52 +01:00
Travis Ralston
972baa881b
Revert "Fix Filepanel scroll position state lost when room is changed" 2020-04-19 19:14:08 -06:00
Michael Telatynski
b86b42c89f Password Login make sure tab takes user to password field
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-18 16:18:01 +01:00
Travis Ralston
9e7b843f5d
Merge pull request #4388 from ThobyV/thobyv/make-filepanel-remember-scroll-position
Fix Filepanel scroll position state lost when room is changed
2020-04-17 15:24:52 -06:00
Travis Ralston
e0d6fa3f51 Rename ref to timelinePanel 2020-04-17 15:15:51 -06:00
Travis Ralston
d910eb4d57 Merge branch 'develop' into thobyv/make-filepanel-remember-scroll-position 2020-04-17 15:10:12 -06:00
Travis Ralston
e72008d7f1 Fix end-to-end tests for end-to-end encryption verification
Fixes https://github.com/vector-im/riot-web/issues/13226

This isn't the fastest route, but it is a predictable route for the happy path we probably want to test. For example, Alice will already be staring at the DM and could easily accept the verification there, but we probably want to make sure that the toast is present and does the right thing. Similarly, neither of them need to verify that there's green shields everywhere, they should be implied, however an explicit check follows a real user's gaze.
2020-04-17 14:31:33 -06:00
Michael Telatynski
29028844f9
Merge pull request #4435 from matrix-org/t3chguy/typo1
Fix typo
2020-04-17 16:47:27 +01:00
Michael Telatynski
518639e8b1 Fix typo
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-17 16:04:38 +01:00
Zoe
e3d784816d Merge branch 'develop' into foldleft/better-errors 2020-04-17 14:11:05 +01:00
Michael Telatynski
66de06c7b9
Merge pull request #4381 from matrix-org/t3chguy/rageshake_incompatible_browser
Rageshake: remind user of unsupported browser and send modernizr report
2020-04-17 13:14:40 +01:00
Michael Telatynski
cd65bdc799 Merge branches 'develop' and 't3chguy/user_online_dot' of github.com:matrix-org/matrix-react-sdk into t3chguy/user_online_dot
 Conflicts:
	src/components/views/rooms/RoomBreadcrumbs.js
	src/components/views/rooms/RoomTile.js
2020-04-17 12:58:54 +01:00
Michael Telatynski
81c7660bf5 Iterate copy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-17 12:25:16 +01:00
Travis Ralston
a5f5f759cb Create unencrypted rooms by default in e2e-tests
Otherwise the lazy loading test will try to join the room after the encrypted messages have already been sent, making them invisible. 

See https://github.com/vector-im/riot-web/issues/13226#issuecomment-614928362
2020-04-16 16:27:43 -06:00
David Baker
9e18dbc0dc Fix key backup debug panel
The type changed so it thought it was not stored when it was
2020-04-16 21:08:14 +01:00
Travis Ralston
0fcaaab1d0 Appease the linter 2020-04-16 11:18:54 -06:00
Travis Ralston
54f8ba4d80 Remove UI to change the cross-signing setting 2020-04-16 11:15:12 -06:00
Travis Ralston
db749519e7 Merge branch 'develop' into travis/cross-sign-setting 2020-04-16 11:06:26 -06:00
Michael Telatynski
aa5573694e
Merge pull request #4428 from matrix-org/t3chguy/kegan_1
Make RoomPublishSetting import-skinnable
2020-04-16 17:26:01 +01:00
Michael Telatynski
e1e65a0fe1 Make RoomPublishSetting import-skinnable
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 17:13:33 +01:00
J. Ryan Stinnett
94ace258f3
Merge pull request #4425 from matrix-org/t3chguy/recovery_copy
Iterate cross-signing copy
2020-04-16 15:31:35 +01:00
Michael Telatynski
e942a35525 Fixxy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 14:09:41 +01:00
Michael Telatynski
ce78e3b8d8 further tweaks by Matthew
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 13:28:12 +01:00
Michael Telatynski
1fb0f39c84 Replace Verify this session and Complete security
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 13:23:01 +01:00
Michael Telatynski
f65c31383d Copy tweaks with Nad
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 12:52:35 +01:00
Michael Telatynski
a9a2999ccc Use recovery passphrase and recovery key everywhere
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 12:26:12 +01:00
Bruno Windels
3933c4c31c ensure twemoji font is loaded when showing SAS emojis 2020-04-16 11:35:54 +02:00
Bruno Windels
33391a3110
Revert "Fix: load Twemoji before login so complete security gets the right emojis during SAS" 2020-04-16 09:25:18 +00:00
Bruno Windels
c396950ca4
Merge pull request #4419 from matrix-org/bwindels/loadtwemojiearlier
Fix: load Twemoji before login so complete security gets the right emojis during SAS
2020-04-16 09:15:24 +00:00
Michael Telatynski
135cecbd4f
Merge pull request #4410 from matrix-org/t3chguy/copy
consolidate and fix copy to clipboard
2020-04-16 09:47:24 +01:00
Bruno Windels
15075e4c10 load twemoji in matrixclient rather than loggedinview 2020-04-16 10:40:09 +02:00
Travis Ralston
b4e2daaf46 Convert cross-signing feature flag to setting
This is intended as a temporary measure until we're comfortable with removing the flag entirely.
2020-04-15 13:18:42 -06:00
Michael Telatynski
f4c4fe7d12
Merge pull request #4413 from matrix-org/t3chguy/wait4initialsync
Login block on initialSync with spinners
2020-04-15 16:17:13 +01:00
Michael Telatynski
81f501e844 disable language dropdown too
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 14:19:47 +01:00
Michael Telatynski
7efbae0470
Merge pull request #4408 from matrix-org/t3chguy/fix_network_dropdown_scrolling
Allow network dropdown to be scrollable and fix context menu padding calc
2020-04-15 14:08:34 +01:00
Michael Telatynski
ac26719b69 disable password reset button when spinning
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 14:07:37 +01:00
J. Ryan Stinnett
fafe57624c
Merge pull request #4412 from matrix-org/jryans/hide-e2e-info-opt
Remove end-to-end message info option when cross-signing is used
2020-04-15 14:07:22 +01:00
Michael Telatynski
8b25223026 fix onLoggedIn getting called twice
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 13:45:12 +01:00
Michael Telatynski
346b2e8588 Login block on initialSync with spinners
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 12:21:49 +01:00
J. Ryan Stinnett
e9c755e73f Remove end-to-end message info option when cross-signing is used
This end-to-end info dialog repeats info available elsewhere and has not been
updated to make sense for cross-signing, triggers old verification methods, etc.
For now, this hides the option to present a more consistent UI.

Relates to https://github.com/vector-im/riot-web/issues/11752
2020-04-15 10:25:05 +01:00
Michael Telatynski
276b5b874c Convert ShareDialog to Typescript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 00:22:19 +01:00
Michael Telatynski
89bc3bdd5b consolidate and extract copyPlaintext, copyNode and selectText
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 00:16:11 +01:00
Travis Ralston
4fe16b1b84
Merge branch 'develop' into travis/moar-jitsi 2020-04-14 12:57:28 -06:00
Travis Ralston
36fea4d487
Merge pull request #4378 from matrix-org/travis/expanding-widgets
Minimize widgets by default
2020-04-14 12:56:10 -06:00
Travis Ralston
f0a2f5dd4f
Merge pull request #4380 from matrix-org/travis/widget-complaints
Add comments to highlight where we'll need m.widget support
2020-04-14 12:55:49 -06:00
Michael Telatynski
769cf1c987 Allow network dropdown to be scrollable and fix context menu window padding calc
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-14 17:34:39 +01:00
Bruno Windels
aef6687931
Merge pull request #4406 from matrix-org/bwindels/completesecuritywithoutspinner
Fix: don't confuse user with spinner during complete security step
2020-04-14 15:54:44 +00:00
Bruno Windels
861c449055
Merge pull request #4405 from matrix-org/bwindels/qrcodefix
Fix: avoid potential crash during certain verification paths
2020-04-14 15:21:47 +00:00
Bruno Windels
db09cadb66 remove spinner, change copy, add button placeholder 2020-04-14 17:19:15 +02:00
Michael Telatynski
7fa38933cb Merge branches 'develop' and 't3chguy/electron-forward-back' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron-forward-back
 Conflicts:
	src/components/structures/LoggedInView.tsx
2020-04-14 15:54:58 +01:00
Bruno Windels
7b3c34bd12 use js-sdk qr code generation 2020-04-14 16:46:02 +02:00
Michael Telatynski
73e5f133fb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into esc-mark-as-read 2020-04-14 15:37:18 +01:00
Michael Telatynski
69382ff8e5 Fix handler to use react bubbling rather than a native global onKeyDown
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-14 15:24:41 +01:00
Michael Telatynski
fc67d1d775
Merge pull request #4398 from matrix-org/t3chguy/liv
Convert LoggedInView to an ES6 PureComponent Class & TypeScript
2020-04-14 15:08:04 +01:00
Michael Telatynski
26569dea06 Revert "@replaceableComponent"
This reverts commit 50d6551c

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-14 14:59:20 +01:00
Michael Telatynski
50d6551c86 @replaceableComponent
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-14 14:50:09 +01:00
Michael Telatynski
6416f404c6
Merge pull request #4403 from matrix-org/t3chguy/fix_e2ee_toggle
Fix create room dialog e2ee private room setting
2020-04-14 13:17:31 +01:00
Michael Telatynski
09d56e7bbc Fix create room dialog e2ee private room setting
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-14 13:05:23 +01:00
Michael Telatynski
384336e8f1 s/alias/address/ in copy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-14 10:06:57 +01:00
Michael Telatynski
46f7fadf3f delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-13 14:33:45 +01:00
Michael Telatynski
96c067a6c4 prefer protected over private so that the class can be extended
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-13 14:30:52 +01:00
Michael Telatynski
368e3f9e85 Convert LoggedInView to TypeScript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-13 14:29:00 +01:00
Michael Telatynski
379aeb667c Convert LoggedInView to a PureComponent class
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-13 14:13:27 +01:00
Michael Telatynski
610fab7857 i18n and delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-11 23:53:24 +01:00
Michael Telatynski
237084da78 wrap node-qrcode in a React FC and use it for ShareDialog instead of qrcode-react
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-11 23:46:58 +01:00
Michael Telatynski
7e996cb91c Add riot-desktop shortcuts for forward/back matching browsers&slack
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-11 18:57:59 +01:00
Michael Telatynski
7a936798b9 Fix invalid commands when figuring out whether to send typing notification
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-11 16:42:14 +01:00
thobyv-kismat
719165c67f fix file panel scroll position lost on room change 2020-04-11 04:03:32 +01:00
thobyv-kismat
8cf6a8c311 refactor RoomScrollStateStore to accomodate scrollmaps for file/notif panel 2020-04-11 02:59:26 +01:00
Michael Telatynski
c000583099
Merge pull request #4384 from matrix-org/t3chguy/composer_pills
Composer pills respect showPillAvatar setting
2020-04-10 16:45:46 +01:00
Michael Telatynski
5846d09ae1
Merge pull request #4385 from matrix-org/t3chguy/slashcmd_typing
Only send typing notification when composing commands which send messages
2020-04-10 16:14:30 +01:00
Michael Telatynski
22558f090d Reverse order of they match/they don't match buttons
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-10 15:38:17 +01:00
Michael Telatynski
caf0b25bd0 Only send typing notification when composing commands which send messages
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-10 13:59:01 +01:00
Michael Telatynski
740b6f6cac Composer pills respect showPillAvatar setting
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-10 09:34:38 +01:00
Travis Ralston
879b4e15e5 Use singular text on 'delete sessions' button for SSO
Missed in https://github.com/matrix-org/matrix-react-sdk/pull/4357

Not a release blocker at this time.
2020-04-09 16:18:12 -06:00
Michael Telatynski
0153f39c10 Rageshake, remind user of unsupported browser and report missing features in report
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-09 22:55:28 +01:00
Travis Ralston
b4b0c4c6df Add comments to highlight where we'll need m.widget support
For https://github.com/vector-im/riot-web/issues/13111
2020-04-09 15:14:07 -06:00
Travis Ralston
dc92f557fd Support m.jitsi-typed widgets as Jitsi widgets
Fixes https://github.com/vector-im/riot-web/issues/9268
2020-04-09 15:11:57 -06:00
Travis Ralston
4d461c6d87
Merge pull request #4377 from matrix-org/travis/sticker-data
Pass widget data through from sticker picker
2020-04-09 14:48:33 -06:00
Travis Ralston
34be024b21 Minimize widgets by default
Fixes https://github.com/vector-im/riot-web/issues/12921
2020-04-09 14:47:20 -06:00
Travis Ralston
3dc03ba089 Pass widget data through from sticker picker
This allows for sticker pickers to have custom template variables.

Fixes https://github.com/vector-im/riot-web/issues/6716
2020-04-09 14:40:23 -06:00
Travis Ralston
db3c7a8f1c Obliterate widgets when they are minimized
Fixes https://github.com/vector-im/riot-web/issues/12810

We do this to all widgets as we can't guarantee what sorts of other widgets might need similar treatment.
2020-04-09 14:31:46 -06:00
Michael Telatynski
a9a253f27f
Merge pull request #4362 from matrix-org/t3chguy/private_room_e2ee
Add toggle for e2ee when creating private room
2020-04-09 17:22:58 +01:00
David Baker
5dfcfb2147
Merge pull request #4372 from matrix-org/dbkr/search_fail_logging
Fix logging for failed searches
2020-04-09 16:27:08 +01:00
David Baker
53b753789a Fix logging for failed searches
error is an object so appending it to a string is not helpful
2020-04-09 16:04:14 +01:00
Bruno Windels
c1dcb690b3
Merge pull request #4369 from matrix-org/bwindels/fixresetkeys
Ensure UI is updated when cross-signing gets disabled
2020-04-09 13:34:40 +00:00
David Baker
b6ef30af8f Retry the request for the master key from SSSS on login
If this failed we assumed it didn't exist which would erroneously
prompt people to upgrade encryption.
2020-04-09 13:40:46 +01:00
Bruno Windels
291fae6493 update room trust when cross-signing gets en/disabled 2020-04-09 13:43:30 +02:00
Travis Ralston
b5aaae1c27 Fix encoding of widget arguments
Fixes https://github.com/vector-im/riot-web/issues/12985

This is done by using a more modern API and de-encoding dollar signs.
2020-04-08 12:58:52 -06:00
Michael Telatynski
4041c030a5 Apply changes from Figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 14:44:34 +01:00
Michael Telatynski
eec28ce38a Update styling and copy to match Figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 13:47:15 +01:00
J. Ryan Stinnett
8ffc206358
Merge pull request #4356 from matrix-org/travis/deactivate-sso
Support deactivating your account with SSO
2020-04-08 12:19:53 +01:00
J. Ryan Stinnett
a5f6a07ed6
Merge pull request #4359 from matrix-org/jryans/backup-key-cache-format
Add debug status for cached backup key format
2020-04-08 11:32:11 +01:00
Michael Telatynski
ada860f163 Add toggle for e2ee when creating private room in x-signing world
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 10:50:22 +01:00
Michael Telatynski
4d7f3ba109
Merge pull request #4361 from matrix-org/t3chguy/fix_composer_placeholder1
Fix composer placeholder not updating
2020-04-08 10:45:35 +01:00
Michael Telatynski
4447370764 Fix composer placeholder not updating
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 10:19:52 +01:00
Michael Telatynski
f61c888f0c
Merge pull request #4358 from matrix-org/t3chguy/fix_complete_security
Fix sas verification buttons to match figma
2020-04-08 10:00:39 +01:00
Travis Ralston
900a05366e Fix share dialog correctly
componentDidMount fires too late for this dialog, so we need to set ourselves up in the constructor.

Fixes https://github.com/vector-im/riot-web/issues/13068
2020-04-07 15:22:38 -06:00
J. Ryan Stinnett
c21dccc397 Add debug status for cached backup key format
Check backup key format to ease tracking such issues

Debug helper for https://github.com/vector-im/riot-web/issues/13057
2020-04-07 19:11:06 +01:00
Michael Telatynski
712e6e8c49 Fix sas verification buttons to match figma and remove useless inDialog prop from EncryptionPanel.js
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-07 19:03:12 +01:00
Travis Ralston
3ab9634249 Pluralize more differently 2020-04-07 11:46:53 -06:00
Travis Ralston
3be197cf86 Use singular copy when only deleting one device 2020-04-07 11:19:56 -06:00
David Baker
112e198a54
Merge pull request #4354 from matrix-org/dbkr/dont_block_dialogs_with_spinner
Don't show spinner over encryption setup dialogs
2020-04-07 17:08:38 +01:00
Michael Telatynski
5c5c095737
Merge pull request #4350 from matrix-org/t3chguy/default_home
Add new default home page fallback
2020-04-07 14:46:23 +01:00
Michael Telatynski
b5e6f8b8c1 Iterate PR
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-07 13:34:10 +01:00
David Baker
bce22c620f Don't show spinner over encryption setup dialogs
Fixes https://github.com/vector-im/riot-web/issues/13051
2020-04-07 13:08:18 +01:00
Michael Telatynski
90255be499 Fix copy button on code blocks when there is no code just pre
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-07 11:17:19 +01:00
Michael Telatynski
4d002bd24d delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-07 10:51:51 +01:00
Michael Telatynski
faab35738f Add new default home page fallback
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-07 10:48:56 +01:00
Travis Ralston
bdeba252ec Support deactivating your account with SSO
Fixes https://github.com/vector-im/riot-web/issues/12940
2020-04-06 15:42:06 -06:00
Zoe
5ef06357f6 Merge branch 'develop' into foldleft/better-errors 2020-04-06 11:36:46 +01:00
Michael Telatynski
fc74d927c0 import VelocityBounce sync as it is *tiny* (481B)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-04 17:23:19 +01:00
Michael Telatynski
fe401ce4da
Merge branch 'develop' into t3chguy/xsigning/fix_userinfo_e2eicon 2020-04-03 18:38:30 +01:00
Bruno Windels
adead76882 Merge branch 'develop' into bwindels/selfverifux 2020-04-03 17:53:07 +02:00
Bruno Windels
364421b088 adjust self-verification copy in incoming verif req toast 2020-04-03 17:04:58 +02:00
Bruno Windels
cdbd4da0e4 adjust copy for self-verification in verification panel 2020-04-03 17:04:29 +02:00
Bruno Windels
030d594e67 for self-verif, mention which device, not user we're verifying in panel 2020-04-03 17:03:37 +02:00
Bruno Windels
c15fa2ba0c
Merge pull request #4334 from matrix-org/bwindels/qr-reciprocate
QR code reciprocation
2020-04-03 12:28:41 +00:00
Bruno Windels
2698751429
Merge pull request #4339 from jungeonkim/develop
Fix Hangul typing does not work properly
2020-04-03 11:52:53 +00:00
JungEon Kim
94236de637 Fix Hangul typing does not work properly
compositionstart event may fire in the meantime because
compositionend event is being processed asynchronously.

Signed-off-by: JungEon Kim <me@jungeon.kim>
2020-04-03 20:43:34 +09:00
J. Ryan Stinnett
cabaf36794
Merge pull request #4340 from matrix-org/jryans/read-marker-groupers
Fix read marker visibility for grouped events
2020-04-03 11:07:46 +01:00
J. Ryan Stinnett
86f39ee0ee Fix read marker visibility for grouped events
The recent "groupers" which extracted out timeline grouping logic forgot to
pass through the last event state for read marker computation. This causes the
read marker to become visible when e.g. returning to room if it was last placed
inside a grouped set of events (currently room creation and membership events).

Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/4059
Related to https://github.com/vector-im/riot-web/issues/12338
2020-04-03 01:14:31 +01:00
Bruno Windels
2ee780caa2 pass isSelf flag to sas component 2020-04-02 18:28:14 +02:00
Bruno Windels
6bb6885578 adjust sas copy to use device -> session 2020-04-02 18:28:01 +02:00
Bruno Windels
cc9c5cabb3 adapt encryption info to self-verification
- hide text when shown in a dialog
 - adapt "waiting for ... to accept" text to self-verif
2020-04-02 17:51:25 +02:00
Bruno Windels
081baa2359 set dialog title for self-verification
use request.isSelfVerification helper
2020-04-02 17:51:06 +02:00
Bruno Windels
009941a6ac Merge branch 'bwindels/qr-reciprocate' into bwindels/selfverifux 2020-04-02 16:57:44 +02:00
Bruno Windels
1baaafe7b9 some comments to explain the mess 2020-04-02 16:44:42 +02:00
Bruno Windels
0307361fa2 more polish for self-verification 2020-04-02 16:42:39 +02:00
Michael Telatynski
1ae370b97e Pull feature_presence_in_room_list out of labs.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-02 15:20:35 +01:00
Michael Telatynski
3612073852 Nuke the icon_person.svg DM Indicator as it causes more confusion than it solves.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-02 15:12:19 +01:00
David Baker
705fd57a4b Fix spurious extra devices on registration
We send a parameter to prevent being immediately logged in after
registration, but we regressed it from snake case to camelcase
during the course of cross-signing dev.

Fixes https://github.com/vector-im/riot-web/issues/12865
2020-04-02 15:09:33 +01:00
Bruno Windels
1f65cfb7f6 polish design and disable buttons after click 2020-04-02 13:44:19 +02:00
Bruno Windels
ccf6c9efdc fixup: more i18n 2020-04-02 13:44:19 +02:00
Bruno Windels
119fd2f519 fixup: these are actually on the verifier 2020-04-02 13:44:19 +02:00
Bruno Windels
fd04f248c4 fix proptype typo 2020-04-02 13:44:19 +02:00
Bruno Windels
00b1afe0fa first go at reciprocate UX 2020-04-02 13:44:19 +02:00
Bruno Windels
1353ddaa96 move qr code data generation to js-sdk 2020-04-02 13:41:19 +02:00
David Baker
74186740ee Fix the edit messager composer
Broken in https://github.com/matrix-org/matrix-react-sdk/pull/4313
Fixes https://github.com/vector-im/riot-web/issues/13001
2020-04-02 11:30:43 +01:00
Michael Telatynski
6db51cf9aa
Merge pull request #4321 from matrix-org/t3chguy/room_settings_notif_icon
Fix Room Settings Dialog Notifications tab icon
2020-04-02 09:50:57 +01:00
Travis Ralston
c5cf04f6d2 More appeasing of the linter 2020-04-01 16:25:59 -06:00
Travis Ralston
8e405dda2e Fix soft crash when editing message
Fixes https://github.com/matrix-org/riot-web-rageshakes/issues/2504
2020-04-01 16:22:42 -06:00
Travis Ralston
31ec984c86 Actually appease the linter 2020-04-01 14:49:39 -06:00
Travis Ralston
5c2841323e Appease the linter by turning it off 2020-04-01 14:45:54 -06:00
Travis Ralston
47e5cfecf2 Silence usages of componentWillReceiveProps
For https://github.com/vector-im/riot-web/issues/12877
2020-04-01 14:35:39 -06:00
Travis Ralston
ab6bd4104f Flag componentWillUpdate as UNSAFE in MatrixChat
For https://github.com/vector-im/riot-web/issues/12877
2020-04-01 14:32:35 -06:00
Travis Ralston
0bb8973ee6 Move rendering of PersistedElements into other lifecycle stages
For https://github.com/vector-im/riot-web/issues/12877

Original error:
```
Warning: Render methods should be a pure function of props and state; triggering nested component updates from render is not allowed. If necessary, trigger nested updates in componentDidUpdate.

Check the render method of PersistedElement.
    in PersistedElement (created by AppTile)
    in div (created by AppTile)
    in div (created by AppTile)
    in AppTile (created by AppsDrawer)
    in div (created by AppsDrawer)
    in div (created by AppsDrawer)
    in AppsDrawer (created by AuxPanel)
    in div (created by AutoHideScrollbar)
    in AutoHideScrollbar (created by AuxPanel)
    in AuxPanel (created by RoomView)
    in div (created by RoomView)
    in div (created by MainSplit)
    in MainSplit (created by RoomView)
    in ErrorBoundary (created by RoomView)
    in main (created by RoomView)
    in RoomView (created by LoggedInView)
    in div (created by LoggedInView)
    in DragDropContext (created by LoggedInView)
    in div (created by LoggedInView)
    in LoggedInView (created by MatrixChat)
    in ErrorBoundary (created by MatrixChat)
    in MatrixChat
```
2020-04-01 14:30:57 -06:00
Travis Ralston
05b58dc81d
Merge pull request #4330 from matrix-org/travis/react-warnings/4-false-positives
Use console.log in place of console.warn for less warnings
2020-04-01 14:14:51 -06:00
Travis Ralston
ba0a9c8439 Use console.log in place of console.warn for less warnings
These aren't react warnings, but they are distracting in the logs.
2020-04-01 13:59:48 -06:00
Travis Ralston
620c2effda
Appease the linter by turning it off 2020-04-01 13:52:49 -06:00
Travis Ralston
e741d0d577 Revert componentDidMount changes on breadcrumbs
Fixes https://github.com/vector-im/riot-web/issues/12990

Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/4313
2020-04-01 13:41:24 -06:00
Travis Ralston
c0ffa8b59a Fix merge conflict between react warnings and SSO 2020-04-01 11:32:13 -06:00
Travis Ralston
07030a9466
Merge branch 'develop' into travis/react-warnings/3-componentCannotDidMount 2020-04-01 11:14:19 -06:00
Travis Ralston
0fcbe40bec
Merge pull request #4314 from matrix-org/travis/react-warnings/2-code-quality
Fix a number of minor code quality issues
2020-04-01 11:13:46 -06:00
Travis Ralston
59a99bbad8
Merge pull request #4313 from matrix-org/travis/react-warnings/1-componentDidMount
Use componentDidMount in place of componentWillMount where possible
2020-04-01 11:13:04 -06:00
Travis Ralston
8f04746e4e Revert to UNSAFE_componentWillMount where componentDidMount will not work 2020-04-01 11:05:49 -06:00
Michael Telatynski
544bd09667
Merge pull request #4320 from matrix-org/t3chguy/user_info_buttons
Fix UserInfo e2e buttons to match Figma
2020-04-01 17:47:05 +01:00
Michael Telatynski
7143c91d16
Merge pull request #4316 from matrix-org/t3chguy/room-tile-auto-scroll
Only auto-scroll to RoomTile when clicking on RoomTile or via shortcuts
2020-04-01 17:46:41 +01:00
Travis Ralston
094d006928
Merge pull request #4292 from matrix-org/travis/sso-uia
Support SSO for interactive authentication
2020-04-01 10:27:24 -06:00
Michael Telatynski
0d8fd83e4d move aria-label and title so that it doesn't wrap the e2e icon
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 17:16:28 +01:00
David Baker
8aa24f8987 Fix jitsi popout URL
Needs the template variables filled in
2020-04-01 14:42:17 +01:00
David Baker
ce68b960f4 Use our own jitsi widget for the popout URL
rather than the URL supplied by the widget
2020-04-01 13:58:44 +01:00
Michael Telatynski
6293684218 Fix Room Settings Dialog Notifications tab icon
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 12:57:28 +01:00
Michael Telatynski
4a4a13ac75 Fix UserInfo e2e buttons to match Figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 12:21:18 +01:00