Michael Telatynski
|
390b05617c
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
Conflicts:
src/components/views/dialogs/CreateRoomDialog.tsx
src/components/views/dialogs/RoomUpgradeDialog.tsx
src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
|
2021-07-21 10:46:41 +01:00 |
|
Travis Ralston
|
5994111e5d
|
Merge remote-tracking branch 'origin/develop' into travis/voice-messages/download
|
2021-07-20 08:55:53 -06:00 |
|
Šimon Brandner
|
dd6379cf4b
|
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-20 13:15:04 +02:00 |
|
Michael Telatynski
|
770de8f6b5
|
Merge pull request #6408 from matrix-org/t3chguy/eslint
|
2021-07-20 11:23:36 +01:00 |
|
Michael Telatynski
|
d3934ff7da
|
Merge branch 'develop' into t3chguy/eslint
|
2021-07-20 11:08:13 +01:00 |
|
Germain Souquet
|
e38682d75c
|
Remove unwanted coma in EventTile
|
2021-07-20 12:05:18 +02:00 |
|
Germain Souquet
|
dd65d47fba
|
lint fix
|
2021-07-20 11:12:17 +02:00 |
|
Germain Souquet
|
06c9a060b4
|
Merge branch 'develop' into gsouquet/message-bubbles-4635
|
2021-07-20 10:16:21 +02:00 |
|
Michael Telatynski
|
ce78cdf4ad
|
Conform to new react and typescript eslint rules
|
2021-07-19 22:43:11 +01:00 |
|
Michael Telatynski
|
de42a00ca4
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
Conflicts:
src/components/views/avatars/RoomAvatar.tsx
test/stores/SpaceStore-test.ts
test/test-utils.js
|
2021-07-19 16:47:31 +01:00 |
|
James Salter
|
f9fbf6f210
|
Rename Copy Link to Copy Room Link
Being explicit is clearer when this context menu applies to DM rooms, to make it clear that the link will be to the room and not to the person
|
2021-07-19 15:05:04 +01:00 |
|
Šimon Brandner
|
21eb299eff
|
Make roomStoreToken readonly
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-18 14:32:24 +02:00 |
|
Šimon Brandner
|
e439d2e911
|
Delint
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-17 15:29:18 +02:00 |
|
Šimon Brandner
|
7b45efc9e9
|
Fix EventTile typing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-17 15:28:02 +02:00 |
|
Šimon Brandner
|
2a7787e12d
|
Convert ReplyPreview to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-17 15:25:42 +02:00 |
|
Šimon Brandner
|
5c5b79a972
|
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-17 08:13:51 +02:00 |
|
Travis Ralston
|
2089127dad
|
Merge pull request #6352 from matrix-org/travis/notifications-2
Notification settings UI refresh
|
2021-07-16 23:56:48 -06:00 |
|
Robin Townsend
|
158e6fa61c
|
Merge branch 'develop' into text-for-event-perf
|
2021-07-16 18:24:22 -04:00 |
|
Travis Ralston
|
942cadc8a3
|
Merge branch 'develop' into travis/notifications-2
|
2021-07-16 16:20:23 -06:00 |
|
Travis Ralston
|
4d38218e24
|
Appease the linter
|
2021-07-16 16:11:27 -06:00 |
|
Šimon Brandner
|
16ed5c6645
|
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-16 21:43:33 +02:00 |
|
Michael Telatynski
|
aaa9040634
|
Merge pull request #6391 from matrix-org/t3chguy/fix/14508.1
|
2021-07-16 19:58:38 +01:00 |
|
James Salter
|
9cb3c71afe
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into copy-room
|
2021-07-16 09:34:30 +01:00 |
|
James Salter
|
329f1c9d6a
|
Update src/components/views/rooms/RoomTile.tsx
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
|
2021-07-16 09:22:17 +01:00 |
|
Michael Telatynski
|
191591e807
|
Make the critical sections of the RLS synchronous to avoid needing to mutex everything
|
2021-07-16 09:15:56 +01:00 |
|
James Salter
|
ff80bbc4a5
|
Move copy link to be before settings
|
2021-07-16 09:10:20 +01:00 |
|
James Salter
|
a1c658f187
|
Set Menu icon to link
|
2021-07-16 09:07:52 +01:00 |
|
James Salter
|
7464900f95
|
Change menu label to Copy Link
|
2021-07-16 09:05:01 +01:00 |
|
Šimon Brandner
|
88da0f4dcf
|
Give audio and video replies an icon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-15 15:17:41 +02:00 |
|
Šimon Brandner
|
7f9f2dbbcb
|
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-15 14:54:06 +02:00 |
|
Michael Telatynski
|
ea20e041b1
|
Merge pull request #6382 from matrix-org/t3chguy/console
|
2021-07-15 13:50:13 +01:00 |
|
Michael Telatynski
|
e9d56d4f13
|
Fix possible uncaught exception for getUrlPreview which would cause 0 url previews if one url was faulty
|
2021-07-15 12:10:01 +01:00 |
|
Michael Telatynski
|
b8ac40ae55
|
Fix React missing key error
|
2021-07-15 11:49:44 +01:00 |
|
Michael Telatynski
|
50b6c5c557
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/spacesperf
Conflicts:
src/components/views/dialogs/InviteDialog.tsx
|
2021-07-15 10:19:04 +01:00 |
|
Michael Telatynski
|
dcb9b9b777
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
Conflicts:
src/components/views/elements/MiniAvatarUploader.tsx
src/components/views/spaces/SpaceSettingsVisibilityTab.tsx
src/i18n/strings/en_EN.json
src/settings/handlers/RoomSettingsHandler.ts
src/stores/SpaceStore.tsx
|
2021-07-15 10:04:48 +01:00 |
|
Michael Telatynski
|
90d380c8ae
|
Cache value of feature_spaces* flags as they cause page refresh so are immutable
|
2021-07-15 08:26:49 +01:00 |
|
Germain
|
c7c29f2119
|
Merge pull request #6365 from psrpinto/fix/naming
|
2021-07-15 08:07:03 +01:00 |
|
Michael Telatynski
|
57f9b819b5
|
Merge pull request #6345 from matrix-org/t3chguy/ts/c1
|
2021-07-14 17:19:07 +01:00 |
|
Germain Souquet
|
51c5094ca4
|
Merge branch 'develop' into gsouquet/message-bubbles-4635
|
2021-07-14 17:47:22 +02:00 |
|
Šimon Brandner
|
acd37d2aad
|
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-14 16:53:05 +02:00 |
|
Travis Ralston
|
fe2eb5ebf0
|
Merge pull request #6370 from matrix-org/travis/voice_messages/right-panel
Fix voice messages in right panels
|
2021-07-14 08:46:55 -06:00 |
|
James Salter
|
8bf5e61acc
|
Add "Copy" to room context menu.
This menu item creates a matrix.to link for the room and copies it to the clipboard.
|
2021-07-14 14:58:18 +01:00 |
|
Šimon Brandner
|
54d2784818
|
Remove unused import
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-14 12:19:16 +02:00 |
|
Šimon Brandner
|
6c801fea53
|
Use MImageReplyBody for stickers
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-14 12:15:13 +02:00 |
|
Šimon Brandner
|
782563af53
|
Override audio and video body with file body
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-14 10:47:29 +02:00 |
|
Š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 |
|