Commit Graph

274 Commits (b97867271bd26b148165e9bd182f0ea4a4eff2ae)

Author SHA1 Message Date
Michael Telatynski bd8fd77d54
Merge pull request #6148 from robintown/fix-timestamps 2021-06-07 13:12:11 +01:00
Germain Souquet a6ddffe74c Add scroll token to file and notif event tiles 2021-06-07 09:26:42 +01: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
Germain 7f83590846
Merge pull request #6079 from matrix-org/gsouquet/switch-rooms 2021-06-03 08:44:01 +01:00
Germain Souquet ecff5bd65c Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash 2021-05-24 09:20:12 +01:00
Germain Souquet 4851e96297 Switch rooms documentation and polishing 2021-05-24 09:17:29 +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
Robin Townsend d3f1754dfd Fix crash on opening notification panel
The check for pending edits needed a null guard, since the notification
panel uses MessagePanel but is not associated with a specific room.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-17 12:24:41 -04:00
Jaiwanth 240753a84f Check for a pending edit only once per render and clear any pending events while switching between edits 2021-05-11 18:37:57 +05:30
Jaiwanth 4ea3fbc5ba Add comments and newlines back and resolve merge conflicts 2021-05-11 11:07:34 +05:30
Travis Ralston 379d19e2e0
Lint 2021-05-10 19:56:30 -06:00
Jaiwanth 6f98aa06c4 Save edited state when switching rooms
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
2021-05-09 13:42:01 +05:30
Ayush PS 32edbc155f Merge remote-tracking branch 'origin/develop' into err 2021-05-07 19:16:00 +05:30
Ayush PS 81f2e67443 Fixed Linting errors 2021-04-28 23:40:23 +05:30
Ayush PS 8b644e783e Finally fixes two todays 2021-04-28 23:23:51 +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
Šimon Brandner 43c236e8a5
Pass showReadReceipts from MessagePanel
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-14 12:24:33 +02:00
Germain Souquet c5eb17eabd reset highlighted event on room timeline scroll 2021-04-07 09:48:56 +01:00
Michael Telatynski 5e3a7c48f4 Fix edge case with redaction grouper messing up continuations 2021-03-25 19:37:55 +00:00
Travis Ralston 2f2bb9456f Reduce code duplication 2021-03-23 18:17:41 -06:00
Travis Ralston fa54ca615a Appease the linter 2021-03-22 21:41:13 -06:00
Travis Ralston 026aa6f88d Track next event [tile] over group boundaries
Fixes https://github.com/vector-im/element-web/issues/16745
2021-03-22 21:39:07 -06:00
Michael Telatynski 497caf5645 Fix redaction event list summaries breaking sender profiles 2021-03-22 13:22:16 +00:00
Michael Telatynski 98df2883d3
Merge pull request #5728 from matrix-org/t3chguy/fix/3657
Collapse redactions into an event list summary
2021-03-19 19:16:20 +00:00
Šimon Brandner 7ac8fdea64
Don't call scrollToBottom() on scroll_to_bottom()
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-18 18:02:33 +01:00
Travis Ralston e5180a472f Merge branch 'develop' into travis/skinning/pt3-easy-comps 2021-03-10 12:30:06 -07:00
Travis Ralston 9e43fca9b6
Merge pull request #5739 from matrix-org/travis/message-state-fixes/hidden-rr
Document behaviour of showReadReceipts=false for sent receipts
2021-03-10 07:23:51 -07:00
J. Ryan Stinnett 32f737e1ba Tweak sent marker code style 2021-03-10 13:45:37 +00:00
Travis Ralston 78568d6a01 Document behaviour of showReadReceipts=false for sent receipts 2021-03-10 01:40:43 -07:00
Travis Ralston ac1ce24b74 Fix sent markers disappearing for edits/reactions
Fixes https://github.com/vector-im/element-web/issues/16651
2021-03-09 20:52:30 -07:00
Travis Ralston c230a75eda Flag structural components as replaceable 2021-03-08 20:23:24 -07:00
Travis Ralston fdea45ad74 Add a quick sender check to isLastSuccessful 2021-03-08 08:51:57 -07:00
Michael Telatynski 6106e01ab4 Collapse redactions into an event list summary 2021-03-08 09:39:07 +00:00
Travis Ralston f87f2b11ef Appease the linter 2021-03-05 11:05:56 -07:00
Travis Ralston ca63e937d3 Fix up logic to show sent receipts correctly 2021-03-05 10:56:13 -07:00
Šimon Brandner 5072fb0608
Merge branch 'develop' into improve-layout-handling 2021-02-15 16:12:08 +01:00
Šimon Brandner 69e81119e9
Don't jump to bottom on reaction
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-05 15:15:20 +01:00
Šimon Brandner f2d236d429
Use LayoutPropType
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-05 08:17:30 +01:00
Šimon Brandner 972c947049
More generic layout setting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-23 10:35:35 +01:00
Šimon Brandner c7ff0f302a
Scroll to bottom on message_sent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-23 09:35:05 +01:00
Michael Telatynski 252484fcd9 add key to make React happier 2020-11-05 17:01:20 +00:00
Michael Telatynski 664079a127 Use MiniAvatarUploader for the new NewRoomIntro component 2020-11-05 15:50:42 +00:00
Michael Telatynski 2fdfe9346f Update copy on the Encryption Enabled bubble tile and room creation ELS to cater better in general but specifically for DMs 2020-11-04 17:50:59 +00:00
Travis Ralston 14a7b83988 Don't show a bottom border ahead of the date separator 2020-09-17 10:40:48 -06:00
Michael Telatynski 9cc789756b UI Feature Flag: Hide flair 2020-09-16 11:26:15 +01:00
Michael Telatynski 7c1935a44e Key EventTile's using txnId if it is set to prevent a remount
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-22 11:10:55 +01:00
J. Ryan Stinnett 51118863c7 Fix jumping to read marker for events without tiles
It is possible for your read marker to be set to an event without a tile (like a
reaction). We would still render the read marker at the position of those events
in the timeline, even though there's no matching tile, which breaks a core
assumption of jump to read marker path: it assumes that if the read marker node
is present in the DOM, then there must also be an event tile with a scroll token
matching the event ID.

This fixes the situation by setting a scroll token on the read marker so it can
always be scrolled to, no matter what kind of event it might represent.

Fixes vector-im/riot-web#10975
2020-06-30 18:40:52 +01:00
Michael Telatynski 6d81337d92 Tidy up continuation algorithm and make it work for hidden profile change events
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-04 13:10:45 +01:00
Jorik Schellekens 5bba62c28b Pass roomId to IRCTimelineProfileResizer 2020-06-01 18:27:10 +01:00
Jorik Schellekens df18638164 useIRCLayout moved to props 2020-06-01 17:34:42 +01:00