Commit graph

851 commits

Author SHA1 Message Date
Šimon Brandner
025148d9fc
Merge branch 'develop' into show-username
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 19:37:22 +02:00
Germain
7f83590846
Merge pull request #6079 from matrix-org/gsouquet/switch-rooms 2021-06-03 08:44:01 +01:00
Michael Telatynski
bc89cf14dd ignore hash/fragment when de-duplicating links for url previews 2021-06-02 11:53:47 +01:00
Germain Souquet
51d88062f9 Merge branch 'develop' into gsouquet/switch-rooms 2021-05-27 10:22:16 +01:00
J. Ryan Stinnett
118556b542
Merge pull request #6106 from matrix-org/jryans/hidden-events-reactions
Update reactions row on event decryption
2021-05-26 17:34:54 +01:00
J. Ryan Stinnett
7d59d5cb39 Tune types in ReactionsRow 2021-05-26 16:51:26 +01:00
J. Ryan Stinnett
d4ca1babbe Update reactions row on event decryption
This fixes a race (perhaps revealed by the recent lazy decryption work) where
the reactions row have reactions to show, but the event would not be decrypted,
so they wouldn't render. Adding a decryption listener gets things moving again.

Fixes https://github.com/vector-im/element-web/issues/17461
2021-05-26 16:47:21 +01:00
Michael Telatynski
1ffbaee560 update style of imports in all modified files 2021-05-26 14:14:55 +01:00
Michael Telatynski
974d62e347 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/12740
 Conflicts:
	src/components/views/messages/TextualBody.js
	src/components/views/right_panel/UserInfo.tsx
	src/dispatcher/actions.ts
2021-05-26 14:08:01 +01:00
Germain Souquet
c7c6a818f0 Merge branch 'develop' into gsouquet/switch-rooms 2021-05-26 09:51:27 +01:00
Jaiwanth
a65299d8be
Update src/components/views/messages/MVoiceMessageBody.tsx
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-05-26 13:07:57 +05:30
Jaiwanth
a4907f8061 Destroy playback instance on unmount 2021-05-26 12:57:39 +05:30
Germain Souquet
f156c2db15 prevent reflow in app when accessing window dimensions 2021-05-25 10:28:43 +01:00
Michael Telatynski
4a5c634d82 Iterate PR 2021-05-24 22:02:50 +01:00
Michael Telatynski
d8acc0612a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/12740
 Conflicts:
	src/components/views/rooms/EditMessageComposer.js
	src/components/views/rooms/SendMessageComposer.js
2021-05-24 21:57:38 +01:00
Michael Telatynski
44e14a7d43 Support blurhashes on stickers 2021-05-24 10:06:17 +01:00
Michael Telatynski
9c599b567d Fix alignment of image blurhashes and interplay with spinners 2021-05-21 21:39:38 +01:00
Michael Telatynski
3a2e5389f6 Support blurhash for video posters 2021-05-21 21:20:00 +01:00
Michael Telatynski
dbca9b4625 use const for blurhash field 2021-05-21 21:19:41 +01:00
Germain Souquet
229c4b98b4 use userGroups cached value to avoid re-render 2021-05-20 18:02:03 +01:00
Michael Telatynski
563e6433b9 Don't store blurhash in state, its immutable and pointless 2021-05-20 15:47:11 +01:00
Germain Souquet
d362321706 Simplify SenderProfile DOM structure 2021-05-20 15:25:20 +01:00
Michael Telatynski
dab75f9b88 Fix add reaction prompt showing even when user is not joined to room 2021-05-20 12:20:53 +01:00
Michael Telatynski
bf01ebae6d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash
 Conflicts:
	package.json
	src/components/views/messages/MImageBody.js
	yarn.lock
2021-05-18 13:48:40 +01:00
Germain Souquet
f9f10de0da use renamed decrypt event method 2021-05-18 13:01:38 +01:00
Germain Souquet
1cfd4b6e1a Use client.decryptEvent to avoid accessing js-sdk private members 2021-05-18 11:41:20 +01:00
Germain Souquet
871c48f69b stop assuming that decryption happens ahead of time 2021-05-18 10:02:21 +01:00
Michael Telatynski
6e5847ea6b Fix right clicking on add reactions prompt button behaviour 2021-05-17 10:01:56 +01:00
Michael Telatynski
a22a1918e1 Fix add reactions prompt button showing up even if all reactions have been removed 2021-05-17 10:01:43 +01:00
Michael Telatynski
a41d76b588 fix typos 2021-05-13 14:14:01 +01:00
Michael Telatynski
76afc1100a Convert to Typescript and move from ClientPeg to Context 2021-05-13 14:13:00 +01:00
Michael Telatynski
87ae47bd61 tweak reactions row some more, third try lucky 2021-05-13 13:59:10 +01:00
Michael Telatynski
36633ec025 Tweak alignment of reactions row, move add reaction to right and only show on hover 2021-05-13 13:32:38 +01:00
Michael Telatynski
b5fa4d88bf Add extra add reactions button to encourage more diverse reactions to content 2021-05-13 10:56:51 +01:00
Travis Ralston
3f4ee9742a Simple rendering of voice messages in the timeline
Fixes https://github.com/vector-im/element-web/issues/17138
2021-05-03 11:41:14 -06:00
J. Ryan Stinnett
83035b6b6a
Merge pull request #5931 from SimonBrandner/fix-indent
Enable indent rule and fix indent
2021-04-30 11:51:22 +01:00
Šimon Brandner
232b87a3b4
Improve formatting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-29 19:57:02 +02:00
Jaiwanth
70204d6111 Prevent peeking members from reacting
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
2021-04-29 22:41:57 +05:30
Šimon Brandner
46bfbbadf9
Enable indent rule and fix indent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 17:23:27 +02:00
Michael Telatynski
cc3571c559 fix removed pixelRatio 2021-04-27 09:56:28 +01:00
Michael Telatynski
915f8b3c9c Scale all mxc thumbs using device pixel ratio for hidpi
as we are notoriously bad at doing it everywhere we ought to, like the TopLeftMenu avatar
2021-04-26 18:25:49 +01:00
Travis Ralston
c5dd6b4dfb Update action bar to incorporate sending states
This moves most of them out of the context menu.
2021-04-21 16:24:17 -06:00
Šimon Brandner
eee1294374
Make both have the same baseline
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-21 17:37:25 +02:00
Šimon Brandner
ffcd79f4a3
Remove brackets
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-21 17:34:03 +02:00
Šimon Brandner
4e1409dc2c
Add private
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-04-20 11:40:50 +02:00
Šimon Brandner
39eb487f49
TS conversion
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-20 11:09:03 +02:00
Šimon Brandner
61a260cd40
Format mxid 2021-04-18 20:02:22 +02:00
Travis Ralston
ac00c80efb
Merge pull request #5521 from SimonBrandner/improve-image-view
Improve image view
2021-04-13 19:01:27 -06:00
Michael Telatynski
5f59e39958 Apply the same to quoting & inserting of emoji then consolidate 2021-04-13 15:09:37 +01:00
Šimon Brandner
e1446f01e4
Make ImageView static
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-13 08:07:17 +02:00