PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
35338 commits 1 branch 0 tags 338 MiB
Commit graph

35338 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
4d16cfc951 Fix 'User' type import 2021-07-14 16:51:45 +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
Germain Souquet
51c5094ca4 Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-14 17:47:22 +02:00
David Baker
6c72955731 Fix 'User' type import 2021-07-14 16:41:01 +01:00
RiotRobot
0fe91c07b8 v3.26.0-rc.1 2021-07-14 16:27:35 +01:00
RiotRobot
70c93a6fee Prepare changelog for v3.26.0-rc.1 2021-07-14 16:27:34 +01:00
RiotRobot
d3823305cc Upgrade matrix-js-sdk to 12.1.0-rc.1 2021-07-14 16:21:02 +01:00
Germain Souquet
dde58d449d Only hide sender when in bubble mode 2021-07-14 17:16:13 +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
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
Germain Souquet
a6120ef3b7 Revert fetchdep script diff 2021-07-14 16:32:29 +02:00
Germain Souquet
789d078814 Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-14 16:26:22 +02:00
Germain Souquet
f4dfe9832b change labs flag wording 2021-07-14 16:20:25 +02: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
Germain Souquet
fc270b435c fix group layout 2021-07-14 15:32:35 +02: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
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