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
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
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
David Baker
a76b089cf3
Merge pull request #4319 from matrix-org/dbkr/jitsi_fix_popout
...
Fix popout support for jitsi widgets
2020-04-01 11:57:25 +01:00
David Baker
9b4ce02eaf
lint
2020-04-01 11:28:02 +01:00
David Baker
a2f92e93a7
Use URL without wurl params for popout
...
The popout can't be assumed to have the widget API available, so
just leave these params out.
2020-04-01 11:18:45 +01:00
Michael Telatynski
6bb6dbc0ff
Fix Ctrl+/ for Finnish keyboard where it includes Shift
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 10:14:15 +01:00
Michael Telatynski
8bc54ae205
Only auto-scroll to RoomTile when clicking on RoomTile or via shortcuts
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 10:08:26 +01:00
David Baker
538147f7fa
Better support for widgets overriding their URLs
...
Move the URL processing into AppTile so that the widget can have a
URL used for embedding in the page and a separate one for popping
out into a browser.
2020-04-01 10:00:33 +01:00
Travis Ralston
6d0d77f98e
Disable the linter on lines it complaints about UNSAFE_componentWillMount
2020-03-31 14:21:12 -06:00
Travis Ralston
0a6f54da33
Label and use UNSAFE_componentWillMount to minimize warnings
...
These TODO comments are expected to be fixed ASAP, but until that happens let's minimize the errors in the console for development.
For https://github.com/vector-im/riot-web/issues/12877
These all aren't using componentDidMount because they do something which causes application instability if componentDidMount were used. Much of these calls are expected to move into constructors once they are converted to real classes.
2020-03-31 14:15:23 -06:00
Travis Ralston
3f99332f4b
Use componentDidMount in place of componentWillMount where possible
...
This fixes a common React warning we see. Most of these components should be using constructors instead, however componentDidMount is just as good (and doesn't require converting most of these).
Conversion to classes will be done in a later stage of React warning fixes.
For https://github.com/vector-im/riot-web/issues/12877
2020-03-31 14:14:17 -06:00
Travis Ralston
c86d75693b
Fix a number of minor code quality issues
...
Most of these are complaints from my IDE. Discovered by going through nearly every file looking for React warnings.
2020-03-31 14:05:56 -06:00
Michael Telatynski
56dda3895c
Merge pull request #4302 from matrix-org/t3chguy/cmds
...
rework SlashCommands to better expose aliases
2020-03-31 17:04:31 +01:00
Travis Ralston
64c11c3565
Move ssoUrl to a class property
2020-03-31 09:26:17 -06:00
Michael Telatynski
eb901441cd
Fix alignment of e2e icon in userinfo and expose full displayname in title
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-31 16:14:18 +01:00
Travis Ralston
4a9bc5e5bf
Update src/components/views/auth/InteractiveAuthEntryComponents.js
...
Co-Authored-By: David Baker <dbkr@users.noreply.github.com>
2020-03-31 08:29:42 -06:00
Michael Telatynski
9ed08e76f8
Merge pull request #4310 from matrix-org/t3chguy/fix_peeking
...
Fix peeking keeping two timeline update mechanisms in play
2020-03-31 14:21:42 +01:00
Michael Telatynski
2624017ab9
Also stop peeking on unmount
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-31 12:51:03 +01:00
Michael Telatynski
6e61761012
Merge branches 'develop' and 't3chguy/cmds' of github.com:matrix-org/matrix-react-sdk into t3chguy/cmds
...
Conflicts:
src/SlashCommands.tsx
2020-03-31 11:49:53 +01:00
Michael Telatynski
a2a9dc6cd0
Fix peeking keeping two timeline update mechanisms in play
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-31 10:37:56 +01:00
J. Ryan Stinnett
2455c5a850
Merge pull request #4303 from matrix-org/jryans/id-change-red
...
Show red shield for users that become unverified
2020-03-31 10:07:28 +01:00
Michael Telatynski
c094afbbe6
Merge pull request #4295 from matrix-org/t3chguy/a11y2
...
Accessibility fixed for Event List Summary and Composer Format Bar
2020-03-31 09:41:20 +01:00
Michael Telatynski
1c5b7bf132
Merge pull request #4279 from matrix-org/t3chguy/instant_sso
...
Support $riot: Templates for SSO/CAS urls in the welcome.html page
2020-03-31 09:39:40 +01:00
Travis Ralston
d899576578
Appease the linter
2020-03-30 20:24:53 -06:00
Travis Ralston
6112d92f80
Remove debugging
2020-03-30 20:11:23 -06:00
Travis Ralston
ffa75ef48c
Wire up all the dialog parts for SSO, using device deletion as a POC
2020-03-30 20:03:46 -06:00
Travis Ralston
b35356833f
Merge branch 'develop' into travis/sso-uia
2020-03-30 14:56:52 -06:00
Michael Telatynski
147e7bc57e
Field: mark id as optional in propTypes
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-30 18:42:47 +01:00
J. Ryan Stinnett
a3555cacea
Merge remote-tracking branch 'origin/develop' into jryans/id-change-red
2020-03-30 14:52:22 +01:00
Zoe
4e8cec354d
Merge pull request #4290 from matrix-org/foldleft/12484-user-shields
...
Refactor shield display logic; changed rules for DMs
2020-03-30 14:23:13 +01:00
Michael Telatynski
8c2b910c03
rework SlashCommands to better expose aliases
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-30 13:59:08 +01:00
Michael Telatynski
90b8d87a39
Merge pull request #4297 from matrix-org/t3chguy/kbd11
...
Keyboard shortcuts: Escape cancel reply and fix Ctrl+K
2020-03-30 10:30:38 +01:00
Michael Telatynski
057ca35c24
Merge pull request #4298 from matrix-org/t3chguy/Bugreportdialog
...
Field: make id optional, generate one if not provided
2020-03-30 10:30:19 +01:00
Michael Telatynski
5375f888ea
Merge pull request #4293 from matrix-org/t3chguy/fix_scrollbars
...
Fix ugly scrollbars in TabbedView (settings), emojipicker and widgets
2020-03-30 10:29:56 +01:00
Zoe
098df07c67
review feedback
2020-03-30 10:18:47 +01:00
Michael Telatynski
55c2d98571
Fix Field ctor
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-29 23:16:57 +01:00
Michael Telatynski
19aae087e0
Field: make id optional, generate one if not provided
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-29 22:59:15 +01:00
Michael Telatynski
acc41585ab
Fix CmdOrCtrl+K for collapsed LHS
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-29 20:33:27 +01:00
Michael Telatynski
2a54a8aa85
Escape should cancel a reply
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-29 20:33:01 +01:00
Michael Telatynski
2ff16844e5
Make ELS somewhat more accessible
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-29 20:12:10 +01:00
Michael Telatynski
b2d905ef2c
Make FormatButton use AccessibleButtons
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-29 20:07:32 +01:00
Michael Telatynski
f586aaab35
Fix ugly scrollbars in TabbedView (settings), emojipicker and widgets
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-28 00:51:01 +00:00
J. Ryan Stinnett
37619dd127
Show red shield for users that become unverified
...
For any users that we previously verified but that are not unverified, we will
now mark them and rooms they are in with a red shield.
Fixes https://github.com/vector-im/riot-web/issues/12808
2020-03-28 00:21:18 +00:00
Travis Ralston
1e30bdb739
Early proof of concept for SSO UIA
...
It works well enough to start doing design.
2020-03-27 14:39:59 -06:00
Travis Ralston
984f9ea4aa
Fix fallback auth link to act and look like a link
2020-03-27 13:44:32 -06:00
Michael Telatynski
9d0ed6e800
fix copy-pasta error
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 14:19:43 +00:00
Michael Telatynski
6664535a26
change welcome page placeholders
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 14:05:32 +00:00
Michael Telatynski
f4d3cc8ee6
revert stale changes
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 14:05:14 +00:00
Michael Telatynski
db6f88c66a
Welcome page, support $ssoUrl and $casUrl placeholders
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 14:02:32 +00:00
Zoe
5b7e7f49d1
lint
2020-03-27 13:50:03 +00:00
Zoe
5d7adef0a2
Factor out shield display rules into one file
2020-03-27 13:45:35 +00:00
Zoe
0f2e2ea069
Update shield display rules
2020-03-27 13:44:54 +00:00
Michael Telatynski
548e918437
only auto-sso when disable_custom_urls is true
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 12:01:10 +00:00
Zoe
a02731f632
Merge branch 'develop' into foldleft/reset-refactor
2020-03-27 10:50:05 +00:00
Michael Telatynski
cf4f595f79
Merge pull request #4289 from matrix-org/t3chguy/userInfo_avatar
...
blank out UserInfo avatar when changing between members
2020-03-27 10:21:53 +00:00
Bruno Windels
2278a724aa
Merge pull request #4283 from matrix-org/bwindels/cancelverifypanel
...
Add cancel button to verification panel
2020-03-27 10:20:02 +00:00
Bruno Windels
a2737899c1
Merge pull request #4276 from matrix-org/bwindels/transparentscrollbars
...
Fix: allow scrolling while window is not focused & remove scrollbar hack
2020-03-27 10:16:53 +00:00
Michael Telatynski
a974f0fe46
blank out UserInfo avatar when changing between members
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 09:59:18 +00:00
Michael Telatynski
7fbfd73e11
Show modal on "instant SSO"
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 01:17:42 +00:00
David Baker
ccb3283fd3
Show whether backup key is cached
...
in cross signing debug panel
2020-03-26 18:50:31 +00:00
Bruno Windels
a6fbb98252
only show close button when not in a dialog, which already has one
2020-03-26 17:02:32 +01:00
Bruno Windels
34b0c1b1e7
fix lint & other cleanup
2020-03-26 16:54:31 +01:00
Bruno Windels
9b54d15fcd
add cancel button to verification panel
2020-03-26 16:53:46 +01:00
Zoe
04849f7f0d
incorporated design feedback
2020-03-26 13:47:32 +00:00
Zoe
9c392ce8bb
Merge branch 'develop' into foldleft/better-errors
2020-03-26 13:38:50 +00:00
Bruno Windels
053a5a5ff4
Merge pull request #4269 from ThobyV/thobyv/hide-formatBar-on-highlight-backspacing-message
...
Fix formatBar not hidden after highlight and backspacing some text
2020-03-26 13:19:06 +00:00
thobyv-kismat
1713006958
recommit bwindels commited changes to refactor check logic after rebase mistake
2020-03-26 14:03:38 +01:00
David Baker
6d90307ff7
Merge pull request #4277 from matrix-org/dbkr/trust_cross_signing_flag
...
Add a flag to control whether cross-signing signatures are trusted
2020-03-26 12:19:14 +00:00
David Baker
e2bb0a3b46
Merge pull request #4281 from matrix-org/dbkr/ssss_upgrade_copy
...
Update copy on SSSS symmetric upgrade toast
2020-03-26 12:04:58 +00:00
David Baker
091e094759
Merge pull request #4270 from matrix-org/dbkr/wait_for_upgrade_to_complete
...
Wait for SSSS upgrade to complete
2020-03-26 12:04:52 +00:00
Michael Telatynski
39fdde627d
Merge pull request #4278 from matrix-org/t3chguy/e2e_copy
...
Update cross-signing verification copy and fix i18n
2020-03-26 11:55:36 +00:00
thobyv-kismat
2bd112ca7c
add delete support and to keyboard shortcuts
2020-03-26 12:40:31 +01:00
thobyv-kismat
c95b23f3ec
fix formatBar not hidden after highlight-backspacing text partially
2020-03-26 12:40:31 +01:00
David Baker
8a64caa925
Merge branch 'dbkr/wait_for_upgrade_to_complete' into dbkr/ssss_upgrade_copy
2020-03-26 11:14:33 +00:00
David Baker
95828ce751
Remove duplicate import
2020-03-26 11:13:57 +00:00
David Baker
8532c72fce
Update copy on SSSS symmetric upgrade toast
...
Fixes https://github.com/vector-im/riot-web/issues/12881
2020-03-26 11:12:00 +00:00
David Baker
4586971a82
Merge remote-tracking branch 'origin/develop' into dbkr/wait_for_upgrade_to_complete
2020-03-26 11:10:07 +00:00
Bruno Windels
785d0e99fb
remove some remaining dead code
2020-03-26 11:17:35 +01:00
Bruno Windels
75cbc1dc07
Adjust IndicatorScrollbar to not rely on AutoHideScrollbar for overflow
2020-03-26 11:17:35 +01:00
Bruno Windels
0436507574
use transparent scrollbars on not hover to emulate scrolbar on hover
...
allows us to get rid of the margin-right hack as well
2020-03-26 11:17:35 +01:00
Bruno Windels
44ce5b5764
Merge pull request #4267 from matrix-org/bwindels/setupcrosssigningafterskip
...
Fix: make self-verification wait for incoming request
2020-03-26 10:08:15 +00:00
David Baker
a9e7bf9899
Merge remote-tracking branch 'origin/develop' into dbkr/trust_cross_signing_flag
2020-03-26 09:40:09 +00:00
Michael Telatynski
c41b39488b
Automatically redirect to SSO when the user clicks through to Login
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-25 23:35:36 +00:00
Michael Telatynski
7ca6a4b777
Iterate copy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-25 23:00:46 +00:00
Michael Telatynski
be3167c870
always show Devices section
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-25 22:44:09 +00:00
Michael Telatynski
d098c91c30
Update cross-signing verification copy and fix i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-25 22:38:11 +00:00
David Baker
327b3c860b
Adding the files would help
2020-03-25 18:47:57 +00:00
David Baker
25e7bde7bc
Add a flag to control whether cross-signing signatures are trusted
...
Fixes: https://github.com/vector-im/riot-web/issues/12616
2020-03-25 18:38:12 +00:00
J. Ryan Stinnett
d869ac9a69
Merge pull request #4268 from matrix-org/jryans/robust-secret-share
...
Log and display secret sharing cache state
2020-03-25 15:00:04 +00:00
Travis Ralston
a7913f4fe5
Merge pull request #4266 from matrix-org/travis/config-wrapper
...
Support sending config and ready events to capable widgets (Jitsi)
2020-03-25 08:26:01 -06:00
Zoe
9dd81216fb
rename secret storage force-reset variable to avoid confusion
2020-03-25 14:22:33 +00:00
Bruno Windels
78b167a7ea
fix typo
2020-03-25 13:40:09 +01:00
Bruno Windels
792a7b3953
don't throw here
2020-03-25 13:07:07 +01:00
Zoe
b7013c6f5d
Merge pull request #4273 from matrix-org/foldleft/12704-key-requests
...
If cached keys are present in the key backup dialog, use them
2020-03-25 11:58:24 +00:00
Zoe
936a4a0022
lint
2020-03-25 11:47:07 +00:00
Zoe
8b2ae3e20f
If cached keys are present in the key backup dialog, use them
2020-03-25 11:41:59 +00:00
Bruno Windels
8521ed1a45
Merge pull request #4265 from ThobyV/thobyv/hide-formatbar-onEnter-highlighted-message
...
Fix formatbar not hidden on highlighted message sent
2020-03-25 09:01:36 +00:00
Aaron Raimist
76104edeca
Mark room as read when escape is pressed
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-03-24 21:37:45 -05:00
David Baker
be50f80314
Wait for SSSS upgrade to complete
...
and show a spinner while it completes
2020-03-24 19:02:57 +00:00
thobyv-kismat
b817c06c6e
fix failing linter tests
2020-03-24 19:09:50 +01:00
thobyv-kismat
91b9a04ede
refactor:consider checking if no placeholder
2020-03-24 19:00:43 +01:00
Travis Ralston
bdcb65de77
Support and send the config over to capable widgets
...
For https://github.com/vector-im/riot-web/pull/12845
2020-03-24 09:55:54 -06:00
J. Ryan Stinnett
1c802cc6af
Show private key cache state in debug panel
2020-03-24 15:50:08 +00:00
Bruno Windels
3e59127d12
use SetupEncryptionBody to show a dialog from "Verify this session"
2020-03-24 16:39:43 +01:00
Bruno Windels
4ff847c8a3
put CompleteSecurity state management in store
...
and split off a child component (SetupCrossSigningBody) that can
be reused from the "Verify this session" toast.
2020-03-24 16:10:15 +01:00
David Baker
8f0e5f76af
Merge remote-tracking branch 'origin/develop' into dbkr/unify_cross_signing_checks
2020-03-24 13:27:12 +00:00
David Baker
0fce57f891
Probably OK for debugging info to access private stuff
2020-03-24 13:13:28 +00:00
David Baker
96ec18a662
Merge pull request #4242 from matrix-org/dbkr/symmetric-ssss-migrate
...
Migration to symmetric SSSS
2020-03-24 13:12:24 +00:00
David Baker
5e1a46c656
Update for new name
2020-03-24 13:03:07 +00:00
thobyv-kismat
d7953dfa6d
fix formatbar not hidden on highlighted message sent
2020-03-24 13:09:06 +01:00
David Baker
d6d15bc5c7
Add secret storage outdated section to advanced
2020-03-24 11:17:33 +00:00
David Baker
99f12a695d
Merge pull request #4262 from matrix-org/dbkr/priority_toasts
...
Always display verification request toasts on top
2020-03-24 09:51:35 +00:00
Bruno Windels
edd84ffd3a
Merge pull request #4249 from matrix-org/bwindels/assumemethodswhentodevice
...
Fix: assume SAS is supported when starting request with .start
2020-03-23 19:39:43 +00:00