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

209 commits

Author SHA1 Message Date
Michael Telatynski
282618d5a1
separate concepts of showing and managing RRs to fix regression 2017-08-30 13:18:14 +01:00
Michael Telatynski
615d96a065
catch hidden event being RM 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-18 11:53:52 +01:00
Michael Telatynski
14903274c0
Change OOO so that MELS generation will continue over hidden events 
this fixes the scenario of N Member events, then an invisible event
e.g. (m.room.aliases) then more Member events. Pre hide-join-parts
this is how it worked.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-16 13:20:32 +01:00
Luke Barnard
0079e70006 Display RM when it = a standalone member event 
Standalone = not next to any member events in the timeline.

fixes vector-im/riot-web#4694
 2017-08-14 15:40:49 +01:00
Michael Telatynski
3eb87e2aa3
change lastShownEventIndex -> lastShownEvent since some places 
do not have the same i reference (namely MELS generation)
this way a member event at bottom of MELS (if is the last event
in the timeline will have last set appropriately)
 2017-07-26 12:17:05 +01:00
Michael Telatynski
a4abd1baa7
fix comment and remove unused const 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-22 12:03:32 +01:00
Michael Telatynski
ae973e1e99
unrevert some more... 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-22 11:37:21 +01:00
Michael Telatynski
7e355f7cda
unrevert most of the logic. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-21 23:18:18 +01:00
Michael Telatynski
1fa4fe0b9a
remove comments/commented code 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-21 22:51:31 +01:00
Michael Telatynski
5808fce60e
fix logic ordering 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-21 22:45:19 +01:00
Michael Telatynski
17758cd1db
attempt to incorporate more code #2 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-21 20:43:03 +01:00
Michael Telatynski
e47e14ed19
attempt to incorporate more code #1 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-21 20:22:01 +01:00
Michael Telatynski
8c333dc3f7 remove debug and add comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-16 14:39:31 +01:00
Michael Telatynski
f0f721aa32 make hiding redactions use new pattern 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-15 20:22:38 +01:00
Michael Telatynski
cebb7182f0 try to make hiding events work with read markers 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-15 20:17:59 +01:00
Michael Telatynski
c53fb08453 pass user settings from above 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-15 20:02:17 +01:00
Michael Telatynski
4b34a2b169 modernize imports 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-15 19:57:48 +01:00
Michael Telatynski
a0a4fe62d5 make hide joins/parts work for MELS and highlighted/permalink event 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-15 19:53:34 +01:00
Michael Telatynski
c1cbdbcc4f Merge branches 'develop' and 'kegan/hide-join-part' of github.com:matrix-org/matrix-react-sdk into kegan/hide-join-part 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/components/structures/UserSettings.js
 2017-06-12 13:22:52 +01:00
Michael Telatynski
5e2e550bf9 don't lose date seperator when the first event of the new day is redacted 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 04:39:44 +01:00
Michael Telatynski
d2d0ba952a allow hiding redactions. no point onAccountData as it'd cause a full 
refresh, this may need to be handled differently in the future.
Currently handling same as the new timestamp stuff

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 04:23:07 +01:00
turt2live
ab1e277f5f Support 12hr time on DateSeparator 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-06-01 09:53:24 -06:00
Kegan Dougal
fc93517094 WIP join/part hiding 
- Doesn't work with MELS
- Doesn't work with read markers
- Doesn't work with jumping to events

Shelving this for now as I fix some of this mess.
 2017-05-31 13:36:19 +01:00
Matthew Hodgson
03194e66b3 actually wire up alwaysShowTimestamps 2017-05-27 00:14:16 +01:00
Kieran Gould
47e5e8d678 Moved isTwelveHour alllll the way up to TimelinePanel. 2017-05-19 23:04:37 +01:00
Luke Barnard
bfa3123f9b Combine data-scroll-token and -contained-scroll-tokens 
- Instead of using one attribute, use one that might just contain one token
 - Use the first token when tracking a child
 - Mandate that no commas can be in individual tokens
 2017-05-04 10:00:13 +01:00
Luke Barnard
3f25928380 Fix jumping to an unread event when in MELS 
This adds the `data-contained-scroll-tokens` API to elements in `ScrollPanel` which allows arbitrary containers of elements with scroll tokens to declare their contained scroll tokens. When jumping to a scroll token inside a container, the `ScrollPanel` will act as if it is scrolling to the container itself, not the child.

MELS has been modified such that it exposes the scroll tokens of all events that exist within it.This means "Jump to unread message" will work if the unread event is within a MELS (which is any member event, because even individual member events surrounded by other events are put inside a MELS).
 2017-05-02 16:34:39 +01:00
Luke Barnard
2012513c0e Allow MELS to have its own RM 
This inserts a RM if any of the events in a MELS if the RM is tracking an event within it.

Fixes https://github.com/vector-im/riot-web/issues/3749
 2017-04-27 14:16:50 +01:00
Matthew Hodgson
24f2aed45f summarise profile changes in MELS 
fixes https://github.com/vector-im/riot-web/issues/3463
 2017-04-23 04:05:50 +01:00
Luke Barnard
c431c9ab22 Clarify comment 2017-04-18 15:18:21 +01:00
Luke Barnard
d38520dfb4 Undo change in ghost RM logic 
Put a XXX to indicate that the ghost tile should be replaced with something mor e stable. As it stands, the ghost will appear, potentially at a different position to the RMs actual position
 2017-04-18 15:17:42 +01:00
Luke Barnard
424aae6b91 Prevent the ghost and real RM tile from both appearing 2017-04-12 15:04:38 +01:00
Luke Barnard
d4ed9e816b Display timestamps and profiles for redacted events 
This is part of fixing https://github.com/vector-im/riot-web/issues/3390
 2017-03-16 17:00:10 +00:00
Luke Barnard
c0fc3ba3fe Make redactions appear when the event has been redacted (on Room.redaction) 2017-03-06 14:20:24 +00:00
Luke Barnard
edccfeb20b No text required, do not continuate after redacted even 
It's curious, however, that a continuation occured after a redacted event, given that the event shouldn't have a sender
 2017-03-06 10:26:26 +00:00
Luke Barnard
2bd9885288 Start to show redacted events 2017-03-03 15:42:24 +00:00
David Baker
fd3c1ab9e1 Merge pull request #718 from matrix-org/luke/ignore-no-tile-events 
Do not push a dummy element with a scroll token for invisible events
 2017-02-23 10:17:16 +00:00
Luke Barnard
f92708fbe6 In practice the MELS-1,2,3 solves nothing, revert it 2017-02-22 16:54:32 +00:00
Luke Barnard
581c8c138e Do not push a dummy element with a scroll token for invisible events 
If an event does not `wantTile`, do not add a dummy element with a scroll token, as this can be unperformant with 1000s of events.
 2017-02-21 15:01:18 +00:00
Luke Barnard
6fead66f89 MELS: check scroll on load + use mels-1,-2,... key 
To fix https://github.com/vector-im/riot-web/issues/2916, force the checking of scroll position by calling _onWidgetLoad (might need renaming...) when a MELS is expanded/contracted.

Also use an keying scheme for MELS that doesn't depend on the events contained, but rather a simple incrementing index based on the order of the MELS as it appears amongst all MELS.
 2017-02-20 10:59:11 +00:00
Luke Barnard
bd106968ce Merge branch 'develop' into luke/fix-join-part-collapsing-causality 
Conflicts:
	src/components/structures/MessagePanel.js
 2017-01-24 14:22:18 +00:00
David Baker
18d4d3392a Fix a bunch of linting errors 
eslint --fix and a few manual ones
 2017-01-20 14:22:27 +00:00
Luke Barnard
d2d78919ce Overhaul MELS to deal with causality, kicks, etc. 
The MELS can now deal with arbitrary sequences of transitions per user, where a transition is a change in membership. A transition can be joined, left, invite_reject, invite_withdrawal, invited, banned, unbanned or kicked.

Repeated segments (modulo 1 and 2), such as joined,left,joined,left,joined will be handled and will be rendered as " ... and 10 others joined and left 2 times and then joined". The repeated segments are assumed to be at the beginning of the sequence. This could be improved to handle arbitrary repeated sequences.
 2017-01-12 18:55:53 +00:00
Luke Barnard
6e2a75bbee Fix redacted member events being visible 
This was due to the `MemberEventListSummary` not ignoring redacted joins/leaves. This was also causing bug #2765.
 2017-01-11 11:27:07 +00:00
Luke Barnard
2a63017372 Account for timezone in date separator calculation (#595) 
* Account for timezone in date separator calculation

Decide on date separators using MatrixEvent.getDate(). This requires matrix-org/matrix-js-sdk#311
 2016-12-22 17:54:30 +00:00
Richard van der Hoff
4804fb3a1c Revert "Fix performance issues with wantsDateSeperator" 
This change broke timezone handling, so that date-separators are shown at the
wrong time of day.

This reverts commit b908e7ef29.
 2016-12-21 09:48:41 +00:00
Richard van der Hoff
b8c0fa507e Merge pull request #590 from matrix-org/luke/fix-membereventlistsummary-performance 
Improve the performance of MemberEventListSummary
 2016-12-16 10:53:51 +00:00
Luke Barnard
6b52b247e7 Update comment on MELS key 2016-12-15 18:26:41 +00:00
Luke Barnard
88aeb6417e Use the first member event ID or "initial" in the MELS key 2016-12-15 18:23:54 +00:00
Luke Barnard
e7564f4dc5 Spelling 2016-12-15 13:16:36 +00:00