David Baker
72acd5a611
Merge pull request #6330 from matrix-org/dbkr/tsify_secretstorage
...
Update import location for types
2021-07-08 09:18:31 +01:00
David Baker
086a8cbbb3
Update import location for types
...
Apparently all the types themselves are fine, even though some of
the function signatures have been updated to return Promises... we
were alreaady await-ing on them.
2021-07-07 20:19:52 +01:00
Šimon Brandner
916589e2b9
Eighth batch of burning
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 11:24:33 +02:00
Šimon Brandner
914de71e9c
Sixth batch of burning
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 10:44:03 +02:00
Šimon Brandner
799d10b77e
Merge remote-tracking branch 'upstream/develop' into burn-sdk-get-comp-with-fire
2021-07-02 17:34:56 +02:00
Šimon Brandner
426c79f47d
Delint
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 17:25:30 +02:00
Šimon Brandner
7325abebd9
Third batch of burning
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 17:19:01 +02:00
Šimon Brandner
9d569c378e
Second batch of burning
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 17:08:27 +02:00
Michael Telatynski
82119a08f7
Merge branch 'develop' into t3chguy/ts/11
2021-07-02 11:03:54 +01:00
David Baker
80f5232217
Comply with new member-delimiter-style rule
...
Just `eslint --fix` with rule from
https://github.com/matrix-org/eslint-plugin-matrix-org/pull/9 in place
2021-07-01 23:23:03 +01:00
Michael Telatynski
88f691776f
Use sleep from js-sdk as no point duplicating it
2021-07-01 22:55:27 +01:00
David Baker
7e8bb70621
Never mind, it wasn't even used
2021-07-01 14:55:00 +01:00
David Baker
676163d5cd
convert NewSessionReviewDialog
2021-07-01 14:51:07 +01:00
David Baker
5d3b94b7c9
Convert VerificationRequestDialog
2021-07-01 14:22:58 +01:00
Michael Telatynski
6250d9ba61
Merge branch 'develop' into t3chguy/ts/4
2021-06-29 22:24:47 +01:00
J. Ryan Stinnett
bbdd93f592
Auto-fix more errors
2021-06-29 13:26:09 +01:00
J. Ryan Stinnett
b501665971
Fix parsing errors
2021-06-29 13:23:13 +01:00
J. Ryan Stinnett
ae0a8b8da4
Auto-fix lint errors
2021-06-29 13:11:58 +01:00
Michael Telatynski
231b40473b
fix the upset CI
2021-06-24 21:22:56 +01:00
Michael Telatynski
bc786cdf4a
Merge pull request #6220 from matrix-org/t3chguy/ts/5.1
2021-06-24 15:23:59 +01:00
Michael Telatynski
01aadb460d
Fix cyclic imports
2021-06-24 11:12:32 +01:00
Michael Telatynski
26d8c4d2e6
Improve design of the multi inviter error dialog
2021-06-24 10:03:32 +01:00
Michael Telatynski
0e2f617d94
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15051
2021-06-24 09:33:39 +01:00
Travis Ralston
9d07519214
Merge remote-tracking branch 'nordeck/nic/feat/DisableModalWidgetButtons' into develop
2021-06-23 11:21:19 -06:00
Michael Telatynski
a8dfc4488f
Convert more of js-sdk crypto and fix underscored field accesses
2021-06-23 14:47:24 +01:00
Germain
35b8f79fbd
Merge pull request #6228 from matrix-org/gsouquet/fix-17673
2021-06-23 09:08:43 +01:00
Michael Telatynski
e4542e13d9
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244
2021-06-22 22:42:59 +01:00
Michael Telatynski
ffaa19ef2c
fix typing
2021-06-22 22:27:12 +01:00
Michael Telatynski
1286be1ffb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244
...
Conflicts:
src/components/views/room_settings/AliasSettings.tsx
2021-06-22 22:02:09 +01:00
Michael Telatynski
5dc542f189
Iterate PR
2021-06-22 22:01:18 +01:00
Michael Telatynski
e3e6b74272
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665
...
Conflicts:
src/stores/SpaceStore.tsx
2021-06-22 17:38:05 +01:00
Germain Souquet
dd58c9f413
Add TruncatedList in AddExistingToSpaceDialog
2021-06-22 10:52:33 +01:00
Germain Souquet
d2595dcd61
use TruncatedList to improve ForwardDialog rendering time
2021-06-21 12:29:59 +01:00
Michael Telatynski
2c5ddea1d9
Fix ConfirmUserActionDialog returning an input field rather than text
2021-06-19 15:57:07 +01:00
David Teller
77a4d345bd
Submitting abuse reports to moderators ( #6213 )
...
This patch is part of MSC3215. It implements `feature_report_to_moderator`
to let end-users send report to room moderators instead of homeserver
administrators.
This only works if the room has been setup for moderation, something that
does not have a UX yet.
Signed-off-by: David Teller <davidt@element.io>
2021-06-18 18:09:02 +02:00
Germain Souquet
fcda0604e0
Fix RoomMember import
2021-06-18 12:48:31 +01:00
Germain Souquet
d22617c422
More specific type definition and adhering to code style better
2021-06-18 12:44:15 +01:00
Germain Souquet
3f1ca970d6
Merge branch 'develop' into gsouquet/dialogs-ts-migration
2021-06-18 12:27:00 +01:00
Michael Telatynski
35e68b8aa5
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665
2021-06-17 15:45:32 +01:00
Michael Telatynski
02e72d8b04
Fix more type definitions
2021-06-17 14:24:53 +01:00
Michael Telatynski
f929d2ee5f
Typescript fixes due to MatrixEvent being TSified
2021-06-17 14:06:03 +01:00
Robin Townsend
ce57b66c91
Fix forward dialog message preview display names
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-16 18:17:25 -04:00
Michael Telatynski
590ce56740
Use MultiInviter error messages in InviteDialog for room invites
2021-06-16 11:48:14 +01:00
Michael Telatynski
47ddd33d21
Remove explicit .js
imports
2021-06-16 10:24:51 +01:00
Michael Telatynski
b4fbc791bb
Add experimental options to the Spaces beta
2021-06-16 09:01:13 +01:00
Michael Telatynski
5098a304c9
delint
2021-06-15 12:33:46 +01:00
Michael Telatynski
83c30b2280
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244
...
Conflicts:
src/components/views/spaces/SpaceCreateMenu.tsx
2021-06-15 12:24:26 +01:00
Germain
d3101b5ce4
Merge branch 'develop' into gsouquet/dialogs-ts-migration
2021-06-15 00:02:49 +01:00
Germain Souquet
2e6dab0bcd
change parameter to use preset enum
2021-06-15 00:01:05 +01:00
Germain Souquet
b2f20e052d
remove unused import
2021-06-14 23:51:38 +01:00