Commit graph

34878 commits

Author SHA1 Message Date
Š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
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
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
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
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
ed1fbad6c4 Respect tile shape for voice messages
Fixes https://github.com/vector-im/element-web/issues/17608
2021-07-13 18:51:53 -06:00
Travis Ralston
9b6495903c Use TileShape enum more universally 2021-07-13 18:35:56 -06:00
Michael Telatynski
de4a29cd3c
Merge pull request #6368 from SimonBrandner/feature/reorder-buttons-image-view 2021-07-13 19:51:32 +01:00
Šimon Brandner
46e1fdf442
Reorder buttons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 20:28:49 +02:00
Michael Telatynski
497ea6ee79
Merge pull request #6367 from SimonBrandner/ignore-vscode 2021-07-13 19:19:47 +01:00
Šimon Brandner
3a0408a4cc
Ignore vscode
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 20:11:52 +02: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