Commit graph

1526 commits

Author SHA1 Message Date
Travis Ralston
01c5f84f60 Merge branch 'develop' into travis/reset-passphrase 2021-04-08 18:07:46 -06:00
David Baker
cd39474d26
Merge pull request #5798 from matrix-org/dbkr/attended_transfer
Attended transfer
2021-04-01 17:34:30 +01:00
Travis Ralston
f86e090b8a
Update src/components/views/dialogs/security/AccessSecretStorageDialog.tsx
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-04-01 08:23:32 -06:00
Germain Souquet
a4345811b0 Merge branch 'develop' into gsouquet-seshat-reset 2021-04-01 09:06:35 +01:00
Germain Souquet
85f9e43f01 Update seshat reset dialog copy 2021-04-01 09:03:50 +01:00
Germain Souquet
4fcb258981 Refactor SeshatResetDialog props interface to use IDialogProps 2021-04-01 08:58:39 +01:00
David Baker
299467c515 Merge remote-tracking branch 'origin/develop' into dbkr/attended_transfer 2021-03-31 10:14:48 +01:00
Travis Ralston
262475f96e Add a button to reset personal encryption state during login 2021-03-30 15:37:06 -06:00
Germain Souquet
b38f5c9459 Simplify event index store reset flow 2021-03-29 15:46:58 +01:00
Germain Souquet
e53a8ad992 Refactor SeshatResetDialog in TypeScript 2021-03-29 08:44:27 +01:00
Michael Telatynski
83612dd4ad
Merge pull request #5792 from matrix-org/t3chguy/spaces4.12
Fixing spaces papercuts
2021-03-26 15:01:31 +00:00
Hubert Chathi
e23583db40
Merge pull request #5763 from uhoreg/room-history-key-sharing2
Share keys for historical messages when inviting users to encrypted rooms
2021-03-26 10:41:54 -04:00
David Baker
989d69ba16 Get tbe transfer target / transferee the right way around
and also switch to the transfer target's room when we call them
2021-03-26 14:21:58 +00:00
J. Ryan Stinnett
ce19d07850
Merge pull request #5805 from matrix-org/travis/ts/access-ss-dialog
Convert AccessSecretStorageDialog to TypeScript
2021-03-26 12:37:24 +00:00
J. Ryan Stinnett
fd59a66523 Tweak cross-signing copy
This makes some Design-approved copy tweaks to the recent cross-signing flow
changes.
2021-03-26 11:13:39 +00:00
Germain Souquet
c40f97fa25 Add reset option for corrupted event index store 2021-03-26 09:44:52 +00:00
Travis Ralston
60e05d2e8c Revert back to using sdk.getComponent() 2021-03-25 23:41:35 -06:00
Travis Ralston
550fba49f7 Appease the eternal linter 2021-03-25 23:37:23 -06:00
Travis Ralston
92ee1ad3cc Convert AccessSecretStorageDialog to TypeScript
This is to make upcoming changes a bit easier to do.
2021-03-25 23:34:45 -06:00
Hubert Chathi
db2f573410 Merge branch 'develop' into room-history-key-sharing2 2021-03-25 19:28:50 -04:00
Hubert Chathi
46fd549ace update with new suggested design 2021-03-25 19:27:14 -04:00
David Baker
82ba546142 WIP attended transfer 2021-03-25 19:56:21 +00:00
Michael Telatynski
5061db259a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/spaces4.12 2021-03-25 16:37:56 +00:00
Germain
356e4bc6fc
Merge pull request #5785 from matrix-org/gsouquet-failed-invites 2021-03-25 14:54:21 +00:00
Germain Souquet
510f08e9f1 Update failed invites copy 2021-03-25 10:11:52 +00:00
Michael Telatynski
e31fc91a03 Fix space setting public/private join rule switch 2021-03-25 09:41:05 +00:00
Michael Telatynski
6e0ab86168 Small usability tweaks to the add existing to space dialog 2021-03-24 14:10:26 +00:00
Michael Telatynski
4e9a2df3b0 Spaces autofocus and prefill the search box 2021-03-24 14:00:52 +00:00
Michael Telatynski
fb46815b6a Spaces move away from Form Buttons 2021-03-24 13:15:31 +00:00
Germain Souquet
b8692bdf17 Prevent state to be toggled whilst a request is pending 2021-03-23 18:25:03 +00:00
Michael Telatynski
128c7db28e
Merge pull request #5777 from matrix-org/t3chguy/spaces4.9
Spaces improve creation journeys
2021-03-22 13:24:10 +00:00
Hubert Chathi
727c189456 apply changes from review 2021-03-19 16:55:07 -04:00
Jaiwanth
70e0b77fc4 Changed invite phrases in context menu and invite dialog 2021-03-19 21:32:52 +05:30
Michael Telatynski
88b7c8f53d Fix add existing to space dialog showing all spaces additionally as rooms 2021-03-19 13:20:30 +00:00
Travis Ralston
1d9d0cd7be Convert a bunch more js-sdk imports to absolute paths
Turns out a lot of the typescript warnings about improper warnings were correct. TypeScript appears to be pulling in two copies of the js-sdk when we do this, which can lead to type conflicts (or worse: the wrong code entirely). We fix this at the webpack level by explicitly importing from `src`, but some alternative build structures have broken tests because of this - jest ends up pulling in the "wrong" js-sdk, breaking things.
2021-03-18 20:50:34 -06:00
Travis Ralston
451a3aaa3f Work around more cases where a rageshake server might not be present
We already do this for a number of other places (slash commands, help section of settings, etc) - these places appear to have been missed, though.
2021-03-16 13:50:43 -06:00
Hubert Chathi
7f141276ff initial work on room history key sharing, take 2 2021-03-15 22:56:56 -04:00
Travis Ralston
d3541b78eb
Merge pull request #5714 from matrix-org/travis/media-customization
Support a media handling customisation endpoint
2021-03-12 11:01:59 -07:00
Travis Ralston
a9a4bd50ca Merge branch 'develop' into travis/media-customization 2021-03-11 08:37:49 -07:00
Panagiotis
be7fb33a67 Merge branch 'develop' into edit-view-source 2021-03-11 17:07:56 +02:00
Travis Ralston
229a95f190
Merge pull request #5734 from matrix-org/travis/skinning/pt3-easy-comps
[SK-3] Decorate easy components with replaceableComponent
2021-03-11 07:26:20 -07:00
J. Ryan Stinnett
6a939c4de8
Merge pull request #5727 from matrix-org/matthew/rework-cross-signing-login
Rework cross-signing login flow
2021-03-11 12:53:55 +00:00
Travis Ralston
fa5d98c319 Convert cases of getHttpUriForMxc to new media customisation 2021-03-10 12:32:18 -07:00
Travis Ralston
1ac12479ca Convert cases of mxcUrlToHttp to new media customisation 2021-03-10 12:32:18 -07:00
Travis Ralston
e5180a472f Merge branch 'develop' into travis/skinning/pt3-easy-comps 2021-03-10 12:30:06 -07:00
Michael Telatynski
98338f1505
Merge pull request #5736 from matrix-org/t3chguy/spaces4.5
Spaces suggested rooms support
2021-03-10 10:56:17 +00:00
Travis Ralston
5b3367d44e Merge remote-tracking branch 'origin/develop' into travis/skinning/pt3-easy-comps 2021-03-09 09:33:19 -07:00
Michael Telatynski
dd0b0834e6 Fix React warning 2021-03-09 13:40:48 +00:00
Travis Ralston
c359dff738 Batch of views getting replaceableComponent decorators 2021-03-08 20:23:34 -07:00
Travis Ralston
3e189d2728 Batch of views getting replaceableComponent decorators 2021-03-08 20:23:29 -07:00
Matthew Hodgson
c02d03cc5b Merge branch 'develop' of git+ssh://github.com/matrix-org/matrix-react-sdk into develop 2021-03-08 04:57:10 +00:00
Matthew Hodgson
6df8157a40 cancel VRD at the Modal level, so clicking in the bg cancels it 2021-03-08 04:45:44 +00:00
Panagiotis
288d98daed chore: format, lint 2021-03-05 00:07:59 +02:00
Panagiotis
af5cfff51d feat: edit button on View Source dialog
reuse component SendCustomEvent
swap it in place in the View Source dialog
the Back button takes you to the View Source dialog, not the DevTools dialog
do not display the flip toggle box for changing between State Event and Normal Event
2021-03-04 23:17:29 +02:00
Panagiotis
ae08f74336 feat: improve "view source"
display encrypted and decrypted event source on the same dialog
keep only one "View Source" action on event context menu
2021-03-03 22:38:30 +02:00
Michael Telatynski
d9a801910a Tweak spaces copy 2021-03-03 11:34:29 +00:00
Michael Telatynski
716268b2f9 Add context menu to spaces in the space panel 2021-03-02 14:35:29 +00:00
Michael Telatynski
e479edd47a Add an add existing room to space CTA to Space View 2021-03-02 13:34:53 +00:00
Michael Telatynski
a687b9883c Add a create room in space CTA to Space View 2021-03-02 13:29:34 +00:00
Michael Telatynski
ab4b7b73ea Add a basic Space Settings view 2021-03-02 13:26:00 +00:00
Michael Telatynski
c10512fd56 Initial SpaceRoomView work 2021-03-01 18:53:11 +00:00
Travis Ralston
10b0051c02 Appease the linter 2021-02-18 15:30:03 -07:00
Travis Ralston
52c73a7a58 Add developer tool to explore and edit settings 2021-02-18 14:56:19 -07:00
Michael Telatynski
da6f1e559b
Merge pull request #5634 from jaiwanth-v/add-loading-TextInputDialog
Added loading and disabled the button while searching for server
2021-02-11 12:22:27 +00:00
Jaiwanth
20dc8dbb32
Update src/components/views/dialogs/TextInputDialog.js
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-02-11 17:39:12 +05:30
Jaiwanth
61c6033de7
Update src/components/views/dialogs/TextInputDialog.js
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-02-11 17:38:58 +05:30
Jaiwanth
6c252a87a1
Update src/components/views/dialogs/TextInputDialog.js
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-02-11 17:38:46 +05:30
Jaiwanth
3fc6d73158 Added loading and disabled the button while searching for server
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
2021-02-11 17:28:02 +05:30
Jason Robinson
23140a84ff Remove host signup config strings, make translatable instead
Also replace the icon in the UserMenu and change the text, requested from design.
2021-02-10 13:38:32 +02:00
Jason Robinson
dc549a9e4b Address some more pr feedback 2021-02-09 22:41:40 +02:00
Jason Robinson
2197c1e519 Address some of the PR feedback 2021-02-09 20:13:58 +02:00
Jason Robinson
c92a930d0a Fix positioning of minimize action and add titles 2021-02-09 12:40:12 +02:00
Jason Robinson
ad5b40b5ba Allow popups from host signup dialog 2021-02-09 12:29:23 +02:00
Jason Robinson
e31b89b952 Restructure host signup terms dialog documents config and dialog 2021-02-09 12:23:27 +02:00
Jason Robinson
2aa4fce1c5 Remove unused types 2021-02-09 11:42:58 +02:00
Jason Robinson
f5f8050172 Add minimize button to HostSignupDialog.tsx 2021-02-04 23:09:58 +02:00
Jason Robinson
fd55b99a26 Remove a comment that is not true anymore 2021-02-04 23:05:24 +02:00
Jason Robinson
987ee702d3 Ensure iframe gets maximize/minimize events 2021-02-04 18:30:12 +02:00
Jason Robinson
6ccce7142c Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-02-03 22:35:22 +02:00
J. Ryan Stinnett
ecc3dbbd80
Merge pull request #5607 from matrix-org/jryans/tally-ho
Lock widget room ID when added
2021-02-02 15:03:09 +00:00
J. Ryan Stinnett
e4629878bc Lock widget room ID when added
This changes the widget room ID available to widget URL templates so that it's
locked to the room the widget was added in.

Fixes https://github.com/vector-im/element-web/issues/16337
2021-02-02 14:36:44 +00:00
Michael Telatynski
5d86c2f8e0 Better errors for SSO failures 2021-02-01 16:42:58 +00:00
Jason Robinson
4ee6016084 Some cleanup 2021-01-29 15:55:14 +02:00
Michael Telatynski
62712159f6
Merge pull request #5578 from matrix-org/t3chguy/sso_fixes
Improve SSO auth flow
2021-01-29 13:28:53 +00:00
Travis Ralston
db346d129b Run a UI refresh over the OIDC Exchange confirmation dialog 2021-01-27 13:13:44 -07:00
Michael Telatynski
e6673bca1b Improve SSO auth flow
Use replaceState instead of a redirect to strip the loginToken
Put user into the same post-auth flows of E2ESetup
Skip UIA prompt in this post-auth flow, happy path is a server grace period
2021-01-27 12:50:12 +00:00
Ayush Kumar
593171bb79 Continuing without email' dialog bug fixes 2021-01-23 15:31:59 +05:30
Dan
591b50b1fb fix issue 16226 to allow switching back to default HS. Signed-off-by: Dan Gwynne dangwynne1@gmail.com 2021-01-21 21:51:22 +00:00
J. Ryan Stinnett
e49a931588
Merge pull request #5533 from aaronraimist/security-key
Change a bunch of strings from Recovery Key/Phrase to Security Key/Phrase
2021-01-21 17:46:02 +00:00
Ayush Kumar
530a242aae Fixed continue button while selecting home server 2021-01-18 21:41:10 +05:30
Jason Robinson
39984c9a34 WIP 2021-01-15 17:14:55 +02:00
Jason Robinson
3901cd9c72 WIP 2021-01-15 17:02:28 +02:00
Jason Robinson
158036ccf9 Merge remote-tracking branch 'origin/develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-01-15 16:12:53 +02:00
Jason Robinson
90a1c5a267 WIP 2021-01-15 15:57:14 +02:00
Jason Robinson
e80dba9414 WIP 2021-01-15 15:32:30 +02:00
Jason Robinson
d6af5b3bbd WIP minimize 2021-01-14 12:20:42 +02:00
Jason Robinson
d4a58bdb2a WIP minimize 2021-01-14 11:53:20 +02:00
Jason Robinson
3da5049dc7 WIP minimize 2021-01-12 17:08:42 +02:00
Jason Robinson
e6605441aa WIP minimize 2021-01-12 14:08:09 +02:00
Travis Ralston
a8d878dc48
Merge pull request #5528 from matrix-org/travis/widget-devtools
Add a basic widget explorer to devtools (per-room)
2021-01-11 11:00:08 -07:00