Commit graph

23 commits

Author SHA1 Message Date
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
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
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
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
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
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
J. Ryan Stinnett
d1649dd301 Tweak interface syntax 2021-04-26 16:16:43 +01:00
J. Ryan Stinnett
cddcedcce2 Merge remote-tracking branch 'origin/develop' into jryans/convert-flow-to-ts 2021-04-26 15:57:28 +01:00
J. Ryan Stinnett
8659c98c44 Add tile shape string type 2021-04-26 15:55:04 +01:00
J. Ryan Stinnett
b8a915bb76 Tweak private / underscores for fields and methods 2021-04-26 14:02:53 +01:00
J. Ryan Stinnett
f34489e2df Actually fix indent lint errors 2021-04-23 18:11:54 +01:00
J. Ryan Stinnett
d7e6f4b4b5 Add basic types 2021-04-23 17:05:50 +01:00
J. Ryan Stinnett
0e92251f70 Fix simple lint errors 2021-04-23 16:28:55 +01:00
J. Ryan Stinnett
31a28b1a9e Update extensions for some files with types
This migrates one bucket of files using some amount of Flow typing to mark them
as TypeScript instead. The remaining type errors are fixed in subsequent
commits.
2021-04-23 16:05:30 +01:00
Renamed from src/components/views/rooms/EventTile.js (Browse further)