Commit Graph

12860 Commits

Author SHA1 Message Date
Michael Telatynski 00a3f5d469 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into revert-6135-t3chguy/fix/17494 2021-07-08 13:29:10 +01:00
Michael Telatynski 5d72ea5e19 Fix Space Create menu not disabling the alias field when busy 2021-07-08 13:24:56 +01:00
Michael Telatynski fc05395dba Don't close settings dialog when opening spaces feedback prompt 2021-07-08 13:24:16 +01:00
Šimon Brandner 9ec3d93402 Better handling of call types
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 14:19:02 +02:00
Šimon Brandner 9c67679b35 Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 2021-07-08 13:30:57 +02:00
Šimon Brandner 6ef7ecbe08 Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 2021-07-08 13:22:56 +02:00
Šimon Brandner 14687f3630 Merge remote-tracking branch 'upstream/develop' into fix/focus-composer-reaction/11023 2021-07-08 13:19:46 +02:00
Šimon Brandner 64f32a9fc1 Focus composer after reacting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 13:12:57 +02:00
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
Michael Telatynski 4ce3723e84 Switch to blurhash-react instead of homegrown component
this has the advantage of resolution scaling logic to do more gpu accelerated scaling
2021-07-07 20:00:31 +01:00
Michael Telatynski 882e66e215 remove stale comment, we include vias now 2021-07-07 18:17:33 +01:00
Michael Telatynski b9a539eaa2 Improve URL Previews
only show 2 by default with expand/collapse mechanism
show all hashes again, but dedup requests
clean up hide mechanism, instead of one `x` per preview have one per group
2021-07-07 18:04:30 +01:00
Šimon Brandner 8ef289b5d6 Merge remote-tracking branch 'upstream/develop' into fix/user-info-dm/17877 2021-07-07 18:36:01 +02:00
Germain 209cafb1f5 Merge pull request #6308 from SimonBrandner/burn-sdk-get-comp-with-fire 2021-07-07 16:30:54 +01:00
Šimon Brandner f91b35a0a0 Merge remote-tracking branch 'upstream/develop' into burn-sdk-get-comp-with-fire
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 17:12:19 +02:00
Michael Telatynski 25dab1eb64 Merge pull request #6307 from matrix-org/t3chguy/fix/17858
Fix instances of the Edit Message Composer's save button being wrongly disabled
2021-07-07 16:03:27 +01:00
Michael Telatynski 30fa5419db Revert "ignore hash/fragment when de-duplicating links for url previews" 2021-07-07 14:30:08 +01:00
Germain Souquet 55896223aa unbubble some type of events 2021-07-07 15:13:58 +02:00
Germain Souquet 10bdb3cefa Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-07 13:07:43 +02:00
Šimon Brandner 1220ad37ce Remove the usage of symbol
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 12:14:44 +02:00
Michael Telatynski b88d67bb00 Convert SearchResult, InteractiveAuth, PushProcessor and Scheduler to Typescript 2021-07-07 11:08:53 +01:00
Šimon Brandner a03b48d5a4 Add missing null guard
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 11:11:00 +02:00
Šimon Brandner 657896c0b9 Delint
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 11:00:42 +02:00
Šimon Brandner fc239ffd01 Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 10:53:22 +02:00
Šimon Brandner 0b52ad48bb Show "Open chat" if DM already exists
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-06 21:56:53 +02:00
Šimon Brandner 38a061a2df Fix ImageView context menu
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-06 20:59:12 +02:00
Germain Souquet fbac730c62 Merge branch 'develop' into gsouquet/fix-backdrop-filter 2021-07-06 15:09:55 +02:00
Germain Souquet a5cec34bad Merge branch 'develop' into t3chguy/fix/17686 2021-07-06 14:53:40 +02:00
Michael Telatynski d004163177 Fix 2 new NPEs 2021-07-06 12:05:30 +01:00
Germain 7d6342fa40 Merge pull request #6315 from matrix-org/gsouquet/ts-1 2021-07-06 12:04:18 +01:00
Michael Telatynski eb9f4c609a Make CreateRoomDialog capable of creating restricted rooms in spaces 2021-07-06 10:10:47 +01:00
Michael Telatynski c5ca98a3ad Iterate SecurityRoomSettingsTab and ManageRestrictedJoinRuleDialog 2021-07-06 10:10:25 +01:00
Michael Telatynski 44bbf60973 Convert Dropdown to Typescript 2021-07-06 09:56:02 +01:00
Germain Souquet edae9a4844 Merge branch 'develop' into gsouquet/fix-backdrop-filter 2021-07-06 10:19:25 +02:00
Michael Telatynski 1b25ab930e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
 Conflicts:
	src/components/views/dialogs/AddExistingToSpaceDialog.tsx
2021-07-05 13:06:22 +01:00
Germain 47b297c2db Merge pull request #5742 from SimonBrandner/reorganize-preferences 2021-07-05 09:33:21 +01:00
Germain Souquet 925d434d53 Linting fix in TypeScript interface 2021-07-05 09:19:19 +02:00
Robin Townsend 055f3a72ad Fix being able to un-rotate images
Since 0 is falsy, this made it impossible to return images to 0 degrees
of rotation.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-03 15:18:47 -04:00
Germain Souquet b5ff7eb7d2 Migrate VerificationShowSas to TypeScript 2021-07-03 12:43:18 +01:00
Germain Souquet 103caffb5b Delete unused VerificationQREmojiOPtions 2021-07-03 12:35:14 +01:00
Germain Souquet a1135783bc Migrate VerificationComplete to TypeScript 2021-07-03 12:32:08 +01:00
Germain Souquet b18691a1cb Migrate VerificationCancelled to TypeScript 2021-07-03 12:31:10 +01:00
Germain Souquet ef4d58c0d9 Migrate SetIntegrationManager to TypeScript 2021-07-03 12:08:56 +01:00
Germain Souquet ef2848664f Migrate InlineTermsAgreement to TypeScript 2021-07-03 12:03:00 +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 6e14c290c8 Seventh batch of burning
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 10:59:57 +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 ab4cd9d0fd Delint
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 10:10:17 +02:00
Šimon Brandner b7ef7d2a47 Fifth batch of burning
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 10:06:42 +02:00