Commit Graph

35169 Commits (6d0fd0322e29a2e4552028689e37109d8e86652e)

Author SHA1 Message Date
Michael Telatynski 5a80530eff Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c4
 Conflicts:
	src/components/structures/RoomDirectory.tsx
	src/components/views/room_settings/RoomPublishSetting.tsx
2021-07-13 15:46:48 +01:00
Michael Telatynski 80f3a64f53
Merge pull request #6362 from matrix-org/t3chguy/fix/inviting 2021-07-13 14:39:28 +01:00
Šimon Brandner 0bbdfefd0d
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-07-13 13:21:27 +02:00
Šimon Brandner 1bca5371d1
Fix redacted messages for the 100th #*&@*%^ time
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 13:18:01 +02:00
Šimon Brandner 8f831a89f6
Remove unused code
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 13:07:47 +02:00
Šimon Brandner 1ec4ead62d
Unused imports
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 13:04:59 +02:00
Šimon Brandner 2660e25d6e
Deduplicate some code
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 13:04:37 +02:00
Michael Telatynski 7433419649 Fix inviter exploding due to member being null 2021-07-13 11:37:31 +01:00
Šimon Brandner 8e456b062a
More unused CSS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 12:32:17 +02:00
Šimon Brandner d149cead5f
Remove unused CSS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 12:27:03 +02:00
Šimon Brandner 8fc90e1d53
Fix isInfoMessage regression
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 12:26:14 +02:00
Šimon Brandner b4ae54dcce
Remove unused CSS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 12:15:22 +02:00
Šimon Brandner 75e7948ca8
Handle event edits
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 11:57:40 +02:00
Šimon Brandner 866a11d7e3
Fix image alignment issues
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 11:49:49 +02:00
Šimon Brandner fca5125c5b
Improve redacted body look
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 10:36:44 +02:00
Šimon Brandner bc7a8f8406
Handle redaction
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 10:12:24 +02:00
Šimon Brandner 9455a6d772
Import replaceableComponent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:40:29 +02:00
Šimon Brandner 562d43e81c
Font
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:36:31 +02:00
Šimon Brandner e01d1572ac
Formatting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:34:43 +02:00
Šimon Brandner 43cf7bc611
Remove 0px
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:33:45 +02:00
Šimon Brandner 069180b16d
Remove contructor
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:31:28 +02:00
Šimon Brandner c44de3bea8
Enums
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:30:52 +02:00
Šimon Brandner b1fb089816
More compact classNames
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:27:22 +02:00
Šimon Brandner 0bf595d8d4
Enums
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:26:27 +02:00
Šimon Brandner 22b029d116
Relation type
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:24:40 +02:00
Šimon Brandner 63ad95246a
EventType enum!
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:23:57 +02:00
Šimon Brandner 931bba747a
Replaceable component
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:22:13 +02:00
Šimon Brandner ef1a1ebe12
TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:21:33 +02:00
Šimon Brandner e4d1859fb7
Ret type
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:21:05 +02:00
Šimon Brandner 4cf4ab2266
Return type
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:20:40 +02:00
Šimon Brandner af7769ce93
Types!
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:20:13 +02:00
Šimon Brandner 86580f3f20
current target
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:19:45 +02:00
Šimon Brandner 6193bc2a82
Types
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:19:19 +02:00
Šimon Brandner fa4977c4da
Use current target
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:18:34 +02:00
Šimon Brandner bdbd03c4ff
Types
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:18:05 +02:00
Šimon Brandner 2a403f6cfe
Remove additional ?
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:17:18 +02:00
Šimon Brandner 5fc35565df
More TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:16:53 +02:00
Šimon Brandner 8f8377a71c
Types
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:16:01 +02:00
Šimon Brandner 70e94f9af5
Formatting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 08:48:43 +02:00
Šimon Brandner b5baf404be
Don't use as
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 08:47:37 +02:00
Šimon Brandner 04098dc74c
Remove unnecessary constructor
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 08:46:45 +02:00
Šimon Brandner ae5e10ff0c
Burn sdk.getComponent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 08:45:36 +02:00
Šimon Brandner 5f81cfe9d9
Nicer formatting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 08:24:18 +02:00
Travis Ralston 8278b2273d Copy over the whole feature of changing the state for keywords entirely 2021-07-13 00:23:56 -06:00
Šimon Brandner cbe94c3c5f
Kill-off sdk.getComponent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 08:23:01 +02:00
Šimon Brandner 7bd7f704f9
Extend IDialogProps
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 08:20:17 +02:00
Šimon Brandner 2e295a94ed
Don't export IProps
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 08:17:51 +02:00
Travis Ralston 9d60d29368 Clean up i18n 2021-07-13 00:04:07 -06:00
Travis Ralston 4444ccb079 Appease the linter 2021-07-13 00:02:44 -06:00
Travis Ralston ff7a18da56 Rewrite Notifications component for modern UI & processing 2021-07-12 23:57:54 -06:00