Commit graph

5147 commits

Author SHA1 Message Date
Šimon Brandner
04db6beb10
Remove stale comment
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 10:30:24 +02:00
Šimon Brandner
ae4d8c291d
It's not an override
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 10:23:24 +02:00
Šimon Brandner
586e85cbff
Use MFileBody in replies
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 10:14:44 +02:00
Šimon Brandner
74ff85ae30
Remove m.sticker since it's not a message type
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 09:52:45 +02:00
Šimon Brandner
9aae33e076
Use string[]
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 09:28:37 +02:00
Robin Townsend
deab0407cb Pull another settings lookup out of SearchResultTile loop
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-13 23:27:49 -04:00
Robin Townsend
8e64b73bd6 Merge branch 'develop' into text-for-event-perf 2021-07-13 23:25:16 -04:00
Travis Ralston
5a75539b93 Introduce a "pinned" tile shape
All components which don't understand this shape will fall through to their normal states, as they would for no explicit tile shape.
2021-07-13 19:01:55 -06:00
Travis Ralston
49c9492484 Pass tile shape down to tiles in the notifications panel 2021-07-13 18:52:07 -06:00
Travis Ralston
9b6495903c Use TileShape enum more universally 2021-07-13 18:35:56 -06:00
Paulo Pinto
76157a7b48 Standardise casing of integration manager
Replace instances of 'Integration Manager' with 'Integration manager', when at start of
sentence, or 'integration manager' when not.

Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-13 16:28:44 +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
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
Š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
75e7948ca8
Handle event edits
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 11:57:40 +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
Germain Souquet
ba3e7e24ba Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-13 10:15:27 +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
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
ae5e10ff0c
Burn sdk.getComponent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 08:45:36 +02:00
Travis Ralston
436563be7b Change label on notification dropdown for a room
by request of design, to reduce mental load
2021-07-12 18:30:42 -06:00
Travis Ralston
e045aa940e Be smart with readonly 2021-07-12 14:11:24 -06:00
Travis Ralston
4c98c0bc23 Increase sample count in voice message thumbnail
Fixes https://github.com/vector-im/element-web/issues/17817

Technically requires https://github.com/matrix-org/matrix-react-sdk/pull/6357 for sample sizing.
2021-07-12 14:02:51 -06:00
Michael Telatynski
ae6eaa5acc Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c1
 Conflicts:
	src/components/structures/RoomDirectory.tsx
	src/components/views/room_settings/RoomPublishSetting.tsx
2021-07-12 18:58:18 +01:00
Michael Telatynski
51f0f5718a improve types 2021-07-12 13:26:34 +01:00
J. Ryan Stinnett
130aee0416
Merge pull request #6343 from matrix-org/jryans/customise-aliases
Add alias and directory customisation points
2021-07-12 12:09:17 +01:00
Šimon Brandner
069c1f4665
Make code a bit cleaner
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-12 12:52:05 +02:00
Jaiwanth
ef944a59f5 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-07-12 15:41:33 +05:30
Michael Telatynski
a645cebb49 Fix setTimeout/setInterval typing 2021-07-12 09:02:46 +01:00
Šimon Brandner
780f9b6add
Handle pill deletion
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-12 09:29:41 +02:00
Robin Townsend
b147bcd207 Merge branch 'develop' into text-for-event-perf 2021-07-11 11:35:12 -04:00
Michael Telatynski
e3e7d41d5c only consider valid & loaded url previews for show N more prompt 2021-07-10 19:41:50 +01:00
Jaiwanth
6a4e2672f6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-07-10 19:18:01 +05:30
Michael Telatynski
829169ec87
Merge pull request #6342 from matrix-org/t3chguy/fix/vrlp
Fix small visual regression with the site name on url previews
2021-07-09 18:05:48 +01:00
J. Ryan Stinnett
4b9d4ad1e3 Centralise display alias getters 2021-07-09 17:06:54 +01:00
Michael Telatynski
8072007782 Fix small visual regression with the site name on url previews 2021-07-09 14:50:55 +01:00
Germain
a1c3f25fe5
Merge pull request #6340 from SimonBrandner/feature/media-devices 2021-07-09 14:09:11 +01:00
Šimon Brandner
dadfba9075
Add MediaDeviceKindEnum
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 13:08:39 +02:00
Michael Telatynski
ac309a0d08
Merge pull request #6332 from SimonBrandner/fix/focus-composer-reaction/11023 2021-07-09 09:05:54 +01:00
Michael Telatynski
f412fb44a7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
 Conflicts:
	src/SlashCommands.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
	src/createRoom.ts
2021-07-09 08:13:39 +01:00
Šimon Brandner
68d194444a
FocusComposer -> FocusSendMessageComposer
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 17:36:31 +02:00
Šimon Brandner
7734f8aeef
Handle focusing multiple composers
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 17:33:49 +02:00