Commit Graph

35044 Commits (6737cfd2978e44c47d8eef73375457c0b91f4505)

Author SHA1 Message Date
Michael Telatynski 12761fd823 add valuable ts-ignore 2021-07-14 19:16:34 +01:00
Michael Telatynski 296d5d1d5e stub out workers for jest tests as it doesn't like the worker-loader 2021-07-14 18:50:01 +01:00
Michael Telatynski 50a9394c59 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c4
 Conflicts:
	src/components/views/room_settings/RoomPublishSetting.tsx
2021-07-14 18:36:12 +01:00
Michael Telatynski 8de4f092d4
Merge pull request #6356 from matrix-org/t3chguy/ts/c3 2021-07-14 18:25:25 +01:00
Michael Telatynski e8fcf0978d fix worker import 2021-07-14 18:05:06 +01:00
Michael Telatynski 0e38eee080 improve typing in the idb worker 2021-07-14 17:53:42 +01:00
Michael Telatynski 4084a11847 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c3 2021-07-14 17:52:32 +01:00
Travis Ralston 5a51b7139c
Merge pull request #6371 from matrix-org/travis/widgets/fix-enc
Send clear events to widgets when permitted
2021-07-14 10:34:08 -06:00
Travis Ralston c4b03064ae fix imports 2021-07-14 10:28:45 -06:00
David Baker 603889dbb8
Merge pull request #6377 from matrix-org/dbkr/comment_only_develop
Comment why end to end tests are only on the develop branch
2021-07-14 17:23:17 +01:00
Michael Telatynski 57f9b819b5
Merge pull request #6345 from matrix-org/t3chguy/ts/c1 2021-07-14 17:19:07 +01:00
Travis Ralston 5dc3d09dd8 Use new function name 2021-07-14 10:18:55 -06:00
David Baker 5399929da5 Comment why end to end tests are only on the develop branch 2021-07-14 17:13:40 +01:00
David Baker 291723107a
Merge pull request #6375 from matrix-org/dbkr/fix_user_type_import
Fix 'User' type import
2021-07-14 16:49:41 +01:00
David Baker 6c72955731 Fix 'User' type import 2021-07-14 16:41:01 +01: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
Travis Ralston 2b8e709125
Merge pull request #6369 from matrix-org/travis/tileshape
Use TileShape enum more universally
2021-07-14 08:46:27 -06:00
James Salter e054af7f38 Run yarn i18n 2021-07-14 15:35:57 +01:00
James Salter 2fe5ad5d4b Slightly refine error message 2021-07-14 15:07:22 +01:00
James Salter 7f70b982cd Add English i18n string 2021-07-14 15:02:59 +01: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
David Baker 181a23d259
Merge pull request #6373 from RiotTranslateBot/weblate-element-web-matrix-react-sdk
Translations update from Weblate
2021-07-14 11:52:44 +01:00
Weblate 14e024b17f Merge branch 'origin/develop' into Weblate. 2021-07-14 10:44:59 +00:00
Phuc D** 769c91387c Translated using Weblate (Vietnamese)
Currently translated at 10.0% (307 of 3046 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/vi/
2021-07-14 10:44:48 +00: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
Paulo Pinto 4b6de3a011 Undo change that impacts analytics action
We dont't want the analytics identitfier to change.

Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-14 11:10:17 +01:00
J. Ryan Stinnett f3970e201a
Merge pull request #5947 from robintown/e2ee-history-visibility
Hide world readable history option in encrypted rooms
2021-07-14 10:00:30 +01: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 f26c75bdcc
Use margin instead of padding
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 10:23:10 +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 18355599e8
Fix senderProfile getting cutoff
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 10:07:41 +02:00
Šimon Brandner 4afd985e7e
Kill off _afterComponentWillUnmount
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 09:55:14 +02:00
Germain 2a66269383
Merge pull request #6372 from SimonBrandner/feature/bigger-image-view-buttons
Make the Image View buttons easier to hit
2021-07-14 08:55:08 +01:00
Šimon Brandner bde26a809a
Omit onFinished
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 09:54:33 +02:00
Šimon Brandner 7b35d2c270
FORCED_IMAGE_HEIGHT into a const
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 09:53:40 +02:00
Šimon Brandner 58dedbeeff
Add missing type
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 09:52:56 +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
Šimon Brandner 6a285bed5a
Make the buttons easier to hit
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 09:06:41 +02:00
Travis Ralston 9495ba001c Send clear events to widgets when permitted
Fixes https://github.com/vector-im/element-web/issues/17615
2021-07-13 23:17:17 -06: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 6c4f0526d7 Coalesce falsy values from TextForEvent handlers
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-13 23:26:09 -04:00
Robin Townsend 8e64b73bd6 Merge branch 'develop' into text-for-event-perf 2021-07-13 23:25:16 -04:00
Robin Townsend 0117d513ea Consolidate disabling of history options
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-13 23:08:43 -04:00
Robin Townsend d568e92e06 Merge branch 'develop' into e2ee-history-visibility 2021-07-13 23:07:11 -04:00
Travis Ralston 1f131db216 Set a max width on waveform-less tiles 2021-07-13 19:02:12 -06:00