Commit graph

1483 commits

Author SHA1 Message Date
Germain Souquet
8b2dc22fe1 fix closing modal when finished 2021-04-14 09:37:06 +01:00
Germain Souquet
f89bbea3f1 Ensure room is synced with account before sending invites 2021-04-14 09:03:47 +01:00
Germain Souquet
8d95c012ef refactor _startDm invite flow to use async/await 2021-04-14 08:44:33 +01:00
Travis Ralston
72a9bda3b7 One less try/catch 2021-04-12 14:57:21 -06:00
Travis Ralston
106de5f7ba Merge branch 'develop' into travis/reset-passphrase 2021-04-12 14:55:31 -06:00
J. Ryan Stinnett
bef5c6593e Remove key sharing feature flag 2021-04-09 17:05:55 +01:00
Travis Ralston
f2e2f1699b Add some catches 2021-04-08 18:09:41 -06:00
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