imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
45967 commits 222 branches 563 tags 470 MiB
Commit graph

358 commits

Author SHA1 Message Date
Michael Telatynski
f38cd38bd3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/12740 
 Conflicts:
	src/components/structures/TimelinePanel.js
	src/components/views/context_menus/MessageContextMenu.js
	src/components/views/right_panel/UserInfo.tsx
	src/dispatcher/actions.ts
 2021-06-17 15:31:06 +01:00
Šimon Brandner
949532c297
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 2021-06-17 15:53:25 +02:00
Michael Telatynski
02e72d8b04 Fix more type definitions 2021-06-17 14:24:53 +01:00
Robin Townsend
af11878e0c Use cached setting values when calling TextForEvent 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-16 20:41:36 -04:00
Jaiwanth
cff4521106 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-16 10:52:00 +05:30
Travis Ralston
ea46df0d48 Partially restore immutable event objects at the rendering layer 
This is primarily to fix some extremely rare edge cases in local echo, but also restores the accuracy of some comments in the stack regarding immutable event objects (which were made mutable many years ago).

This shouldn't have any impact on the daily usage of the app, only adding a measured 0ms of latency to the stack.
 2021-06-15 14:23:19 -06:00
Tulir Asokan
cdd2773aa6 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-06-15 17:37:49 +03:00
Germain Souquet
b1824ce579 fix HTML tag for Event Tile when not rendered in a list 2021-06-11 11:34:53 +01:00
Šimon Brandner
fdda534053
Merge branch 'develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-09 19:23:14 +02:00
J. Ryan Stinnett
c6972c4535 Fix spelling 2021-06-09 15:53:38 +01:00
J. Ryan Stinnett
e566704bdf Remove redundant early return 2021-06-09 15:48:30 +01:00
J. Ryan Stinnett
b43315c6c1 Restore read receipt animation from event to event 
This restores expected read receipt animation by always including the positioned
parent of read receipts. I imagine there's something smarter we could be doing,
but for now, at least least get back to expected behaviour.

Fixes https://github.com/vector-im/element-web/issues/17561
 2021-06-09 15:46:10 +01:00
Jaiwanth
6160b11eb8 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-09 16:46:28 +05:30
Jaiwanth
573ababb8c Get rid of mediaSrc and avatarSrc props 2021-06-09 15:23:47 +05:30
Germain
8334a2ba60
Merge pull request #6143 from robintown/hide-events-perf 2021-06-09 09:13:56 +01:00
Jaiwanth
dbb3614374
Merge branch 'develop' into export-conversations 2021-06-08 18:43:03 +05:30
Jaiwanth
6f8c1638aa isExporting -> forExport and wrap EventTile with Context Provider 2021-06-08 18:35:45 +05:30
Tulir Asokan
059241b5cc Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-06-07 19:26:12 +03:00
Michael Telatynski
bd8fd77d54
Merge pull request #6148 from robintown/fix-timestamps 2021-06-07 13:12:11 +01:00
Germain
ea6904ce2a
Fix local echo comment for scroll tokens 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-06-07 12:37:11 +01:00
Germain Souquet
d111f4cbb1 Merge branch 'develop' into gsouquet/fix-files-scroll-token 2021-06-07 12:25:08 +01:00
Germain Souquet
a6ddffe74c Add scroll token to file and notif event tiles 2021-06-07 09:26:42 +01:00
Robin Townsend
903d4d252a Add optimized function to determine whether event has text to display 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-06 23:06:56 -04:00
Robin Townsend
ea2120bdfd Fix timestamps 
7f83590846 changed timestamps to be hidden
at the DOM level, not the CSS level. We can keep that approach, we just
need to ensure they still get shown at the right times.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-06 01:55:01 -04:00
Jaiwanth
8786c97cdb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-05 11:27:08 +05:30
J. Ryan Stinnett
ab96d5f8af Repair event status position in timeline 
https://github.com/matrix-org/matrix-react-sdk/pull/6079 caused a regression in
the event status indicator. The `mx_EventTile_msgOption` container was folded
into the avatars code path, but the event status is a special case of this, so
it now needs to also have this container to preserve its positioning.

Fixes https://github.com/vector-im/element-web/issues/17552
 2021-06-04 11:54:58 +01:00
Š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
Germain
a36063704d
Merge pull request #6138 from matrix-org/gsouquet/containment-event 
Fix mx_Event containment rules and empty read avatar row
 2021-06-03 16:38:55 +01:00
Germain Souquet
a34f8a29f4 fix mx_Event containment rules and empty read avatar row 2021-06-03 08:41:12 +01:00
Jaiwanth
1382bd4fee Handle icons and skip decryption checks during export 2021-06-01 14:47:01 +05:30
Šimon Brandner
dac741d8b9
Another rewrite 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 09:30:37 +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
85bcf8ed52
Hook up CallEventGrouper 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-30 19:44:17 +02:00
Šimon Brandner
eaa3645238
Hook up 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
cb88f37bbd Remove outdated diagnostic log 
The cited issue (https://github.com/vector-im/element-web/issues/11120) has
since been fixed, so this "temporary" (2 years ago) logging is no longer needed.
 2021-05-25 12:28:16 +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
Germain Souquet
4851e96297 Switch rooms documentation and polishing 2021-05-24 09:17:29 +01:00
Germain Souquet
ccfd6ba4b1 fix linting issues 2021-05-21 12:53:26 +01:00
Germain Souquet
0f63098c59 Remove typo semicolon 2021-05-20 18:02:44 +01:00
Germain Souquet
f058fd8869 Reduce amount of DOM nodes 2021-05-20 15:39:25 +01:00
Germain Souquet
171539d42d Simplify EventTile structure 
Only render MessageTimestamp to the DOM when a tile is hovered
 2021-05-20 15:26:02 +01:00
Ayush PS
39402ec971 Lint errors 2021-05-07 19:14:29 +05:30
Ayush PS
c843387043 Merge branch 'develop' into Bubble-bericht 2021-05-07 18:32:38 +05:30
Tulir Asokan
330f222dd1 Remove redundant code and move presentableTextForFile out of MFileBody 
Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2021-05-01 16:11:30 +03:00