Commit graph

1158 commits

Author SHA1 Message Date
Michael Telatynski
660a849cdd Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash
 Conflicts:
	package.json
	src/ContentMessages.tsx
	yarn.lock
2021-06-15 12:58:29 +01:00
Michael Telatynski
91df392a2a
Merge pull request #5880 from SimonBrandner/show-username 2021-06-14 21:34:01 +01:00
Šimon Brandner
e260e8671f
Inline display name into return
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-11 15:14:16 +02:00
Jaiwanth
a1b614f2b3 Implement exporting from a specific start date and fix few bugs 2021-06-11 12:04:05 +05:30
Germain Souquet
7f3173f170 Implement unencrypted warning slate in rooms 2021-06-10 11:14:43 +01:00
Jaiwanth
573ababb8c Get rid of mediaSrc and avatarSrc props 2021-06-09 15:23:47 +05:30
Jaiwanth
6f8c1638aa isExporting -> forExport and wrap EventTile with Context Provider 2021-06-08 18:35:45 +05:30
Šimon Brandner
b39c615abc
Reorder
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 19:44:58 +02:00
Šimon Brandner
4185185cdc
Reduce number of DOM elements
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-07 19:42:48 +02:00
Š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
Tulir Asokan
059241b5cc Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-06-07 19:26:12 +03:00
Jaiwanth
b68ea48444 Explicitly declare cli and use alt attribute for images 2021-06-07 12:22:02 +05:30
Jaiwanth
8786c97cdb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-05 11:27:08 +05:30
Šimon Brandner
6eb33ac730
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-04 07:49:05 +02:00
Šimon Brandner
3b2d6d442f
Translate unknown call state
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-04 07:43:30 +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
Šimon Brandner
3331e7bfbe
Use enums where possible
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-02 10:42:58 +02:00
Šimon Brandner
78229a2fd0
Support user busy
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-02 10:20:11 +02:00
Šimon Brandner
521b2445a8
Refactoring and fixes
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-02 10:18:32 +02:00
Jaiwanth
692e499cf2 Handle encrypted stickers and store stickers in a separate folder 2021-06-02 12:06:00 +05:30
Šimon Brandner
70a5715b3d
Support hangup reasons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 14:46:41 +02:00
Šimon Brandner
0785997983
Handle missed calls
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 11:28:45 +02:00
Jaiwanth
1382bd4fee Handle icons and skip decryption checks during export 2021-06-01 14:47:01 +05:30
Šimon Brandner
79ec655e66
Fix translations
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 10:58:17 +02:00
Šimon Brandner
c1fcadba3b
Manage some more call states
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 10:33:44 +02:00
Šimon Brandner
f96e25d833
Simply use call states
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 10:11:48 +02:00
Šimon Brandner
30365ca1ad
Allow picking up calls from the timeline
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 10:03:17 +02:00
Šimon Brandner
dac741d8b9
Another rewrite
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 09:30:37 +02:00
Šimon Brandner
8eb24d0d74
Rename callState to timelineCallState
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 08:01:34 +02:00
Šimon Brandner
5e4a10ab84
Reorganize HTML
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 07:55:55 +02:00
Jaiwanth
a0a604618c Handle non-media attachments 2021-05-31 23:50:55 +05:30
Jaiwanth
5f1c9d0f88 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-05-31 22:58:11 +05:30
Jaiwanth
28a1a551fe Save users' avatars 2021-05-31 22:27:29 +05:30
Jaiwanth
59c1b67b7d Enable support for image, video and audio files 2021-05-31 21:01:19 +05:30
Jaiwanth
573a3ca983 Rewrite export tool to use existing components to render output, use existing source URLs for media 2021-05-31 19:01:32 +05:30
Šimon Brandner
5e8df03724
Fix styling a bit
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-30 19:44:17 +02:00
Šimon Brandner
85bcf8ed52
Hook up CallEventGrouper
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-30 19:44:17 +02:00
Šimon Brandner
4ae92d8adc
Hook up TimelineCallEventStore and add Avatar
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-30 19:44:17 +02:00
Šimon Brandner
3ac63b03a6
Use styling for CallEvent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-30 19:44:17 +02:00
Šimon Brandner
73c66c36dd
Add basic CallEvent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-30 19:44:17 +02: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