Germain Souquet
d9eec1c03b
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-06-30 08:58:20 +01:00
Michael Telatynski
8f4879ea96
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8
...
Conflicts:
src/components/structures/MessagePanel.tsx
src/components/structures/ScrollPanel.tsx
src/components/structures/TimelinePanel.tsx
src/components/views/elements/ErrorBoundary.tsx
src/components/views/elements/EventListSummary.tsx
src/components/views/messages/TileErrorBoundary.tsx
2021-06-29 22:14:40 +01:00
Michael Telatynski
623317cd47
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8
...
Conflicts:
src/components/structures/MessagePanel.tsx
src/components/structures/TimelinePanel.tsx
2021-06-29 15:22:54 +01:00
J. Ryan Stinnett
ae0a8b8da4
Auto-fix lint errors
2021-06-29 13:11:58 +01:00
J. Ryan Stinnett
a8f5b7ebae
Merge pull request #5953 from DantrazTrev/Bubble-bericht
...
Removes the override on the Bubble Container
2021-06-28 16:23:40 +01:00
Michael Telatynski
cecf0ce299
Convert MessagePanel, TimelinePanel, ScrollPanel, and more to Typescript
2021-06-22 20:41:26 +01:00
Michael Telatynski
a839d0f396
More typescript conversion
2021-06-22 17:23:13 +01:00
Travis Ralston
9344adb2d2
Revert "Partially restore immutable event objects at the rendering layer"
2021-06-19 13:38:19 -06:00
Germain Souquet
6271c5c3d8
first iteration for message bubble layout
2021-06-18 18:59:22 +01:00
Travis Ralston
273fb75fc9
Merge branch 'develop' into travis/event-fixes
2021-06-18 11:26:51 -06:00
Michael Telatynski
dddc32d870
Merge pull request #6208 from matrix-org/t3chguy/ts/5
2021-06-18 09:49:03 +01:00
Travis Ralston
98e0200b4a
Function name
2021-06-17 14:21:50 -06:00
Ayush Pratap Singh
1259247380
Merge branch 'matrix-org:develop' into Bubble-bericht
2021-06-18 00:16:16 +05:30
Ayush PS
1394e5b0a4
Updated changes for the tile
...
Signed-off-by: Ayush PS <ayushpratap16@gmail.com>
2021-06-18 00:12:39 +05:30
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
Michael Telatynski
02e72d8b04
Fix more type definitions
2021-06-17 14:24:53 +01:00
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
Germain Souquet
b1824ce579
fix HTML tag for Event Tile when not rendered in a list
2021-06-11 11:34:53 +01: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
Germain
8334a2ba60
Merge pull request #6143 from robintown/hide-events-perf
2021-06-09 09:13:56 +01: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
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
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
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