Commit graph

149 commits

Author SHA1 Message Date
Aaron Raimist
bdc56be863
Auto fix
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-10-22 17:23:37 -05:00
Germain
35b5109c2a
Fix threads broken layout (#6997) 2021-10-20 18:14:24 +01:00
Germain Souquet
3dcf0d0b7e Fix incorrect logic to hide thread relations 2021-10-15 10:25:42 +01:00
Germain Souquet
d315641056 Make threads use 'm.thread' relation 2021-10-14 17:04:27 +01:00
Dariusz Niemczyk
562a880c7d
Create room threads list view (#6904)
Implement https://github.com/vector-im/element-web/issues/18957 following requirements:
* Create a new right panel view to list all the threads in a given room.
* Change ThreadView previous phase to be ThreadPanel rather than RoomSummary
* Implement local filters for My and All threads

In addition: 
* Create a new TileShape for proper rendering requirements (hiding typing indicator)
* Create new timelineRenderingType for proper rendering requirements
2021-10-14 15:27:35 +02:00
Dariusz Niemczyk
1331e960fa
Add ability to properly edit messages in Threads. (#6877)
* Fix infinite rerender loop when editing message

* Refactor "edit_event" to Action.EditEvent

* Make up-arrow edit working in Threads

* Properly handle timeline events edit state

* Properly traverse messages to be edited

* Add MatrixClientContextHOC

* Refactor RoomContext to use AppRenderingContext

* Typescriptify test

Co-authored-by: Germain <germains@element.io>
2021-10-01 15:35:54 +02:00
Jaiwanth
94e4fb71c1 Merge branch 'develop' into export-conversations 2021-09-22 18:07:01 +05:30
Germain Souquet
225380b248 Do not hide the root event of a thread 2021-09-20 12:53:08 +01:00
Robin Townsend
def1c68c16 Fix message bubble corners being wrong in the presence of hidden events
Signed-off-by: Robin Townsend <robin@robin.town>
2021-09-09 16:11:36 -04:00
Germain Souquet
385222719c Fix replies not appearing in timeline 2021-09-06 15:53:18 +01:00
Germain Souquet
54a0a869bf PR feedback 2021-08-24 09:09:28 +01:00
Germain Souquet
d5356361a9 Hide thread UI behind experimentalThreadSupport flag 2021-08-19 14:56:51 +01:00
Germain Souquet
ac0412d238 rename feature flag for Threads 2021-08-19 12:25:29 +01:00
Germain Souquet
95f4513bd2 Make UI respond to thread events 2021-08-17 17:42:47 +01:00
Germain Souquet
d1dbfbd014 hide thread events from the timeline 2021-08-17 11:10:02 +01:00
Jaiwanth
036d8a15c6 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations 2021-08-09 10:36:43 +05:30
Šimon Brandner
5f68ad92d1
Merge remote-tracking branch 'upstream/develop' into feature/collapse-pinned-mels/17938
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 07:43:19 +02:00
Jaiwanth
17e9cf4d2a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-07-30 12:17:31 +05:30
Germain Souquet
8104ba936c Add data-layout to MELS for better CSS structure 2021-07-27 11:30:25 +02:00
Jaiwanth
b04bfeda33 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations 2021-07-26 00:18:56 +05:30
Šimon Brandner
2df4f7b859
Merge remote-tracking branch 'upstream/develop' into feature/collapse-pinned-mels/17938 2021-07-22 07:51:58 +02:00
Šimon Brandner
e7c5711bb7
membershipTypes -> groupedEvents
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 07:45:48 +02:00
Germain Souquet
26ca41f699 Cache room member count on the messagePanel 2021-07-21 17:26:41 +02:00
Germain Souquet
43d62aa8c1 Use more performant getMembersCount to decide to hide or show sender 2021-07-21 16:43:57 +02:00
Germain Souquet
e5bc5a933e Use cached value to read member count 2021-07-21 16:10:18 +02:00
Germain Souquet
ae51653348 Add null guard for room prop in EventTile 2021-07-21 12:41:02 +02:00
Jaiwanth
1ed316851a Merge upstream and resolve conflicts 2021-07-21 11:35:27 +05:30
Šimon Brandner
dd6379cf4b
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 13:15:04 +02:00
Germain Souquet
06c9a060b4 Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-20 10:16:21 +02:00
Jaiwanth
fe2cac56f9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-07-19 12:57:27 +05:30
Šimon Brandner
5c5b79a972
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 08:13:51 +02:00
Robin Townsend
092fdf5e5e Be consistent about MessagePanel setting lookups
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-16 18:46:29 -04:00
Robin Townsend
158e6fa61c Merge branch 'develop' into text-for-event-perf 2021-07-16 18:24:22 -04:00
Šimon Brandner
16ed5c6645
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 21:43:33 +02:00
Michael Telatynski
b0053f36d3 Fix instances of event.sender being read for just the userId - this field may not be set in time 2021-07-15 17:43:24 +01:00
Germain Souquet
dde58d449d Only hide sender when in bubble mode 2021-07-14 17:16:13 +02:00
Šimon Brandner
f80f4620df
Add pinned messages to MELS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-11 10:35:20 +02:00
Germain Souquet
55896223aa unbubble some type of events 2021-07-07 15:13:58 +02:00
Germain Souquet
7d946ee0db Restore action bar 2021-07-07 12:04:28 +02:00
Šimon Brandner
85399e8edf
Match code style
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 13:16:45 +02:00
Šimon Brandner
b014763cd2
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 13:14:14 +02:00
Jaiwanth
551639811b Merge and resolve conflicts 2021-06-30 12:29:13 +05:30
Robin Townsend
adb5df52a4 Merge branch 'develop' into text-for-event-perf 2021-06-29 22:13:18 -04:00
Michael Telatynski
a59e94b907 delint 2021-06-29 22:21:05 +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
Robin Townsend
a921d32f44 Fix lint
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-24 18:51:46 -04:00
Robin Townsend
f9fe28a6ad Merge branch 't3chguy/ts/8' into text-for-event-perf 2021-06-24 18:45:08 -04:00
Michael Telatynski
cecf0ce299 Convert MessagePanel, TimelinePanel, ScrollPanel, and more to Typescript 2021-06-22 20:41:26 +01:00
Renamed from src/components/structures/MessagePanel.js (Browse further)